Merge 4.7-rc4 into staging-next

We want the fixes in here, and we can resolve a merge issue in
drivers/iio/industrialio-trigger.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 4 insertions, 2 deletions

diff --git a/fs/namespace.c b/fs/namespace.c
index 4fb1691b4355..a7ec92c051f5 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -2409,8 +2409,10 @@ static int do_new_mount(struct path *path, const char *fstype, int flags,
                         mnt_flags |= MNT_NODEV | MNT_LOCK_NODEV;
                 }
                 if (type->fs_flags & FS_USERNS_VISIBLE) {
-                        if (!fs_fully_visible(type, &mnt_flags))
+                        if (!fs_fully_visible(type, &mnt_flags)) {
+                                put_filesystem(type);
                                 return -EPERM;
+                        }
                 }
         }
 
@@ -3271,7 +3273,7 @@ static bool fs_fully_visible(struct file_system_type *type, int *new_mnt_flags)
                 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_flags & MNT_LOCKED))
+                        if (!(child->mnt.mnt_flags & MNT_LOCKED))
                                 continue;
                         /* Is the directory permanetly empty? */
                         if (!is_empty_dir_inode(inode))