From: David Howells Date: Fri, 20 Apr 2018 12:35:02 +0000 (+0100) Subject: vfs: Undo an overly zealous MS_RDONLY -> SB_RDONLY conversion X-Git-Tag: v4.17-rc2~18 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a9e5b73288cf1595ac2e05cf1acd1924ceea05fa;p=users%2Fhch%2Fuuid.git vfs: Undo an overly zealous MS_RDONLY -> SB_RDONLY conversion In do_mount() when the MS_* flags are being converted to MNT_* flags, MS_RDONLY got accidentally convered to SB_RDONLY. Undo this change. Fixes: e462ec50cb5f ("VFS: Differentiate mount flags (MS_*) from internal superblock flags") Signed-off-by: David Howells Signed-off-by: Linus Torvalds --- diff --git a/fs/namespace.c b/fs/namespace.c index 8634d565b858..5f75969adff1 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -2815,7 +2815,7 @@ long do_mount(const char *dev_name, const char __user *dir_name, mnt_flags |= MNT_NODIRATIME; if (flags & MS_STRICTATIME) mnt_flags &= ~(MNT_RELATIME | MNT_NOATIME); - if (flags & SB_RDONLY) + if (flags & MS_RDONLY) mnt_flags |= MNT_READONLY; /* The default atime for remount is preservation */