Commit b30d87cf authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'work.dcache' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull d_path fix from Al Viro:
 "Fix d_absolute_path() regression in the last cycle (felt by tomoyo,
  mostly)"

* 'work.dcache' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  [PATCH] fix d_absolute_path() interplay with fsmount()
parents 53e5e7a7 f2683bd8
...@@ -116,8 +116,10 @@ static int prepend_path(const struct path *path, ...@@ -116,8 +116,10 @@ static int prepend_path(const struct path *path,
vfsmnt = &mnt->mnt; vfsmnt = &mnt->mnt;
continue; continue;
} }
if (!error) if (is_mounted(vfsmnt) && !is_anon_ns(mnt->mnt_ns))
error = is_mounted(vfsmnt) ? 1 : 2; error = 1; // absolute root
else
error = 2; // detached or not attached yet
break; break;
} }
parent = dentry->d_parent; parent = dentry->d_parent;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment