Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 0 deletions

diff --git a/fs/namespace.c b/fs/namespace.c
index a7ec92c051f5..783004af5707 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -3247,6 +3247,10 @@ static bool fs_fully_visible(struct file_system_type *type, int *new_mnt_flags)
                 if (mnt->mnt.mnt_sb->s_iflags & SB_I_NOEXEC)
                         mnt_flags &= ~(MNT_LOCK_NOSUID | MNT_LOCK_NOEXEC);
 
+                /* Don't miss readonly hidden in the superblock flags */
+                if (mnt->mnt.mnt_sb->s_flags & MS_RDONLY)
+                        mnt_flags |= MNT_LOCK_READONLY;
+
                 /* Verify the mount flags are equal to or more permissive
                  * than the proposed new mount.
                  */