---

yaml
---
r: 209635
b: refs/heads/master
c: 44672e4
h: refs/heads/master
i:
  209633: 863a362
  209631: 0f17e6f
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: baa0389073eb7beb9d36f6d13df97e16c1bfa626
+refs/heads/master: 44672e4fbd40e2dda8bbce7d0f71d24dbfc7e00e

trunk/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);
 	}