Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier

Conflicts:
	block/blk-core.c
	drivers/block/loop.c
	mm/swapfile.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
index 3cdc1ad0787e..52cc865f1464 100644
--- a/security/apparmor/policy.c
+++ b/security/apparmor/policy.c
@@ -1151,12 +1151,14 @@ ssize_t aa_remove_profiles(char *fqname, size_t size)
                 /* released below */
                 ns = aa_get_namespace(root);
 
-        write_lock(&ns->lock);
         if (!name) {
                 /* remove namespace - can only happen if fqname[0] == ':' */
+                write_lock(&ns->parent->lock);
                 __remove_namespace(ns);
+                write_unlock(&ns->parent->lock);
         } else {
                 /* remove profile */
+                write_lock(&ns->lock);
                 profile = aa_get_profile(__lookup_profile(&ns->base, name));
                 if (!profile) {
                         error = -ENOENT;
@@ -1165,8 +1167,8 @@ ssize_t aa_remove_profiles(char *fqname, size_t size)
                 }
                 name = profile->base.hname;
                 __remove_profile(profile);
+                write_unlock(&ns->lock);
         }
-        write_unlock(&ns->lock);
 
         /* don't fail removal if audit fails */
         (void) audit_policy(OP_PROF_RM, GFP_KERNEL, name, info, error);