diff options
| -rw-r--r-- | fs/mount.h | 7 | ||||
| -rw-r--r-- | fs/namespace.c | 9 |
2 files changed, 10 insertions, 6 deletions
diff --git a/fs/mount.h b/fs/mount.h index ed8c83ba836a..04d0eadc4c10 100644 --- a/fs/mount.h +++ b/fs/mount.h @@ -235,4 +235,11 @@ static inline void mnt_notify_add(struct mount *m) } #endif +static inline struct mount *topmost_overmount(struct mount *m) +{ + while (m->overmount) + m = m->overmount; + return m; +} + struct mnt_namespace *mnt_ns_from_dentry(struct dentry *dentry); diff --git a/fs/namespace.c b/fs/namespace.c index b48bfb46b351..b6983adaa73b 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -2696,10 +2696,9 @@ static int attach_recursive_mnt(struct mount *source_mnt, child->mnt_mountpoint); commit_tree(child); if (q) { + struct mount *r = topmost_overmount(child); struct mountpoint *mp = root.mp; - struct mount *r = child; - while (unlikely(r->overmount)) - r = r->overmount; + if (unlikely(shorter) && child != source_mnt) mp = shorter; mnt_change_mountpoint(r, mp, q); @@ -6168,9 +6167,7 @@ bool current_chrooted(void) guard(mount_locked_reader)(); - root = current->nsproxy->mnt_ns->root; - while (unlikely(root->overmount)) - root = root->overmount; + root = topmost_overmount(current->nsproxy->mnt_ns->root); return fs_root.mnt != &root->mnt || !path_mounted(&fs_root); } |