Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[linux-2.6] / security / selinux / ss / sidtab.c

diff --git a/security/selinux/ss/sidtab.c b/security/selinux/ss/sidtab.c
index 53a54a77f1f8ca806a65becc6e5464e394d48dbc..4a516ff4bcdeb2b7e77df8a88ff57546eaef58c2 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);