|
@@ -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)))
|
|
((mnt->mnt.mnt_flags & MNT_ATIME_MASK) != (new_flags & MNT_ATIME_MASK)))
|
|
continue;
|
|
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) {
|
|
list_for_each_entry(child, &mnt->mnt_mounts, mnt_child) {
|
|
struct inode *inode = child->mnt_mountpoint->d_inode;
|
|
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))
|
|
if (!S_ISDIR(inode->i_mode))
|
|
goto next;
|
|
goto next;
|
|
if (inode->i_nlink > 2)
|
|
if (inode->i_nlink > 2)
|