Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	net/mac80211/main.c

1 files changed, 2 insertions, 7 deletions

diff --git a/security/apparmor/path.c b/security/apparmor/path.c
index 96bab9469d4..19358dc1460 100644
--- a/security/apparmor/path.c
+++ b/security/apparmor/path.c
@@ -62,19 +62,14 @@ static int d_namespace_path(struct path *path, char *buf, int buflen,
         int deleted, connected;
         int error = 0;
 
-        /* Get the root we want to resolve too */
+        /* Get the root we want to resolve too, released below */
         if (flags & PATH_CHROOT_REL) {
                 /* resolve paths relative to chroot */
-                read_lock(&current->fs->lock);
-                root = current->fs->root;
-                /* released below */
-                path_get(&root);
-                read_unlock(&current->fs->lock);
+                get_fs_root(current->fs, &root);
         } else {
                 /* resolve paths relative to namespace */
                 root.mnt = current->nsproxy->mnt_ns->root;
                 root.dentry = root.mnt->mnt_root;
-                /* released below */
                 path_get(&root);
         }