Commit b30d87cf authored Sep 18, 2019 by 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

fs/d_path.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -116,8 +116,10 @@ static int prepend_path(const struct path *path,
		vfsmnt = &mnt->mnt;
		continue;
		}
		if (!error)
		error = is_mounted(vfsmnt) ? 1 : 2;
		if (is_mounted(vfsmnt) && !is_anon_ns(mnt->mnt_ns))
		error = 1; // absolute root
		else
		error = 2; // detached or not attached yet
		break;
		}
		parent = dentry->d_parent;