Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[pandora-kernel.git] / security / selinux / ss / sidtab.c

diff --git a/security/selinux/ss/sidtab.c b/security/selinux/ss/sidtab.c
index d78f9ff..4a516ff 100644 (file)
--- a/security/selinux/ss/sidtab.c
+++ b/security/selinux/ss/sidtab.c
@@ -156,12 +156,10 @@ void sidtab_map_remove_on_error(struct sidtab *s,
                while (cur != NULL) {
                        ret = apply(cur->sid, &cur->context, args);
                        if (ret) {
-                               if (last) {
+                               if (last)
                                        last->next = cur->next;
-                               } else {
+                               else
                                        s->htable[i] = cur->next;
-                               }
-
                                temp = cur;
                                cur = cur->next;
                                context_destroy(&temp->context);
@@ -253,7 +251,7 @@ void sidtab_hash_eval(struct sidtab *h, char *tag)
                }
        }
 
-       printk(KERN_INFO "%s:  %d entries and %d/%d buckets used, longest "
+       printk(KERN_DEBUG "%s:  %d entries and %d/%d buckets used, longest "
               "chain length %d\n", tag, h->nel, slots_used, SIDTAB_SIZE,
               max_chain_len);
 }