vfs: Ignore unlocked mounts in fs_fully_visible

[firefly-linux-kernel-4.4.55.git] / fs / namespace.c

diff --git a/fs/namespace.c b/fs/namespace.c
index 63b9806235e6471c4fb06af6ed1f0882e068c269..8c7b8e0941b9b852cd3e97b59fdd10e7af9c32ff 100644 (file)
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -3205,11 +3205,15 @@ static bool fs_fully_visible(struct file_system_type *type, int *new_mnt_flags)
                    ((mnt->mnt.mnt_flags & MNT_ATIME_MASK) != (new_flags & MNT_ATIME_MASK)))
                        continue;
 
-               /* This mount is not fully visible if there are any child mounts
-                * that cover anything except for empty directories.
+               /* This mount is not fully visible if there are any
+                * locked child mounts that cover anything except for
+                * empty directories.
                 */
                list_for_each_entry(child, &mnt->mnt_mounts, mnt_child) {
                        struct inode *inode = child->mnt_mountpoint->d_inode;
+                       /* Only worry about locked mounts */
+                       if (!(mnt->mnt.mnt_flags & MNT_LOCKED))
+                               continue;
                        if (!S_ISDIR(inode->i_mode))
                                goto next;
                        if (inode->i_nlink > 2)