diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-18 13:14:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-18 13:14:14 -0700 |
| commit | b30d87cf969e1711f1f621b6b61efb145ee6c6d9 (patch) | |
| tree | 44bc419b7f2b2559b9015e783358e7f8ea2601ac /fs | |
| parent | 53e5e7a7a71cb531edd3a4399f1abc68d7045764 (diff) | |
| parent | f2683bd8d5bdebb929f05ae26ce6d9b578927ce5 (diff) | |
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()
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/d_path.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/d_path.c b/fs/d_path.c index a7d0a96b35ce..0f1fc1743302 100644 --- a/fs/d_path.c +++ b/fs/d_path.c @@ -116,8 +116,10 @@ restart: 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; |