summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2018-04-20 13:35:02 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2018-04-20 09:59:33 -0700
commita9e5b73288cf1595ac2e05cf1acd1924ceea05fa (patch)
tree78695c337412a7052dce7a9610d77c9dff9c57b3 /fs
parent660625922b3d9fcb376e5870299bc5c1086e1d32 (diff)
downloadlinux-stable-a9e5b73288cf1595ac2e05cf1acd1924ceea05fa.tar.gz
linux-stable-a9e5b73288cf1595ac2e05cf1acd1924ceea05fa.tar.bz2
linux-stable-a9e5b73288cf1595ac2e05cf1acd1924ceea05fa.zip
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 <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/namespace.c2
1 files changed, 1 insertions, 1 deletions
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 */