Merge branch 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull mount flag updates from Al Viro:
 "Another chunk of fmount preparations from dhowells; only trivial
  conflicts for that part. It separates MS_... bits (very grotty
  mount(2) ABI) from the struct super_block ->s_flags (kernel-internal,
  only a small subset of MS_... stuff).

  This does *not* convert the filesystems to new constants; only the
  infrastructure is done here. The next step in that series is where the
  conflicts would be; that's the conversion of filesystems. It's purely
  mechanical and it's better done after the merge, so if you could run
  something like

	list=$(for i in MS_RDONLY MS_NOSUID MS_NODEV MS_NOEXEC MS_SYNCHRONOUS MS_MANDLOCK MS_DIRSYNC MS_NOATIME MS_NODIRATIME MS_SILENT MS_POSIXACL MS_KERNMOUNT MS_I_VERSION MS_LAZYTIME; do git grep -l $i fs drivers/staging/lustre drivers/mtd ipc mm include/linux; done|sort|uniq|grep -v '^fs/namespace.c$')

	sed -i -e 's/\<MS_RDONLY\>/SB_RDONLY/g' \
	        -e 's/\<MS_NOSUID\>/SB_NOSUID/g' \
	        -e 's/\<MS_NODEV\>/SB_NODEV/g' \
	        -e 's/\<MS_NOEXEC\>/SB_NOEXEC/g' \
	        -e 's/\<MS_SYNCHRONOUS\>/SB_SYNCHRONOUS/g' \
	        -e 's/\<MS_MANDLOCK\>/SB_MANDLOCK/g' \
	        -e 's/\<MS_DIRSYNC\>/SB_DIRSYNC/g' \
	        -e 's/\<MS_NOATIME\>/SB_NOATIME/g' \
	        -e 's/\<MS_NODIRATIME\>/SB_NODIRATIME/g' \
	        -e 's/\<MS_SILENT\>/SB_SILENT/g' \
	        -e 's/\<MS_POSIXACL\>/SB_POSIXACL/g' \
	        -e 's/\<MS_KERNMOUNT\>/SB_KERNMOUNT/g' \
	        -e 's/\<MS_I_VERSION\>/SB_I_VERSION/g' \
	        -e 's/\<MS_LAZYTIME\>/SB_LAZYTIME/g' \
	        $list

  and commit it with something along the lines of 'convert filesystems
  away from use of MS_... constants' as commit message, it would save a
  quite a bit of headache next cycle"

* 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  VFS: Differentiate mount flags (MS_*) from internal superblock flags
  VFS: Convert sb->s_flags & MS_RDONLY to sb_rdonly(sb)
  vfs: Add sb_rdonly(sb) to query the MS_RDONLY flag on s_flags

76 files changed, 314 insertions, 296 deletions

diff --git a/Documentation/filesystems/porting b/Documentation/filesystems/porting
index 5fb17f49f7a2..93e0a2404532 100644
--- a/Documentation/filesystems/porting
+++ b/Documentation/filesystems/porting
@@ -228,7 +228,7 @@ anything from oops to silent memory corruption.
 ---
 [mandatory]
 
-        FS_NOMOUNT is gone.  If you use it - just set MS_NOUSER in flags
+        FS_NOMOUNT is gone.  If you use it - just set SB_NOUSER in flags
 (see rootfs for one kind of solution and bdev/socket/pipe for another).
 
 ---
diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c
index d855129768f8..25393e3a0fe8 100644
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@ -210,7 +210,7 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
         data->ocd_ibits_known = MDS_INODELOCK_FULL;
         data->ocd_version = LUSTRE_VERSION_CODE;
 
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 data->ocd_connect_flags |= OBD_CONNECT_RDONLY;
         if (sbi->ll_flags & LL_SBI_USER_XATTR)
                 data->ocd_connect_flags |= OBD_CONNECT_XATTR;
@@ -2031,7 +2031,7 @@ int ll_remount_fs(struct super_block *sb, int *flags, char *data)
         int err;
         __u32 read_only;
 
-        if ((*flags & MS_RDONLY) != (sb->s_flags & MS_RDONLY)) {
+        if ((bool)(*flags & MS_RDONLY) != sb_rdonly(sb)) {
                 read_only = *flags & MS_RDONLY;
                 err = obd_set_info_async(NULL, sbi->ll_md_exp,
                                          sizeof(KEY_READ_ONLY),
diff --git a/drivers/staging/lustre/lustre/llite/namei.c b/drivers/staging/lustre/lustre/llite/namei.c
index 4897dbd3286d..5cc2b3255207 100644
--- a/drivers/staging/lustre/lustre/llite/namei.c
+++ b/drivers/staging/lustre/lustre/llite/namei.c
@@ -561,8 +561,7 @@ static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry,
                 }
         }
 
-        if (it->it_op & IT_OPEN && it->it_flags & FMODE_WRITE &&
-            dentry->d_sb->s_flags & MS_RDONLY)
+        if (it->it_op & IT_OPEN && it->it_flags & FMODE_WRITE && sb_rdonly(dentry->d_sb))
                 return ERR_PTR(-EROFS);
 
         if (it->it_op & IT_CREAT)
diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c
index b573c3b9a328..8cf941c3b511 100644
--- a/fs/affs/amigaffs.c
+++ b/fs/affs/amigaffs.c
@@ -450,7 +450,7 @@ affs_error(struct super_block *sb, const char *function, const char *fmt, ...)
         vaf.fmt = fmt;
         vaf.va = &args;
         pr_crit("error (device %s): %s(): %pV\n", sb->s_id, function, &vaf);
-        if (!(sb->s_flags & MS_RDONLY))
+        if (!sb_rdonly(sb))
                 pr_warn("Remounting filesystem read-only\n");
         sb->s_flags |= MS_RDONLY;
         va_end(args);
diff --git a/fs/affs/bitmap.c b/fs/affs/bitmap.c
index 675148950fed..2b2112475ec2 100644
--- a/fs/affs/bitmap.c
+++ b/fs/affs/bitmap.c
@@ -19,7 +19,7 @@ affs_count_free_blocks(struct super_block *sb)
 
         pr_debug("%s()\n", __func__);
 
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 return 0;
 
         mutex_lock(&AFFS_SB(sb)->s_bmlock);
diff --git a/fs/affs/super.c b/fs/affs/super.c
index 7bf47a41cb4f..884bedab7266 100644
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -80,7 +80,7 @@ void affs_mark_sb_dirty(struct super_block *sb)
         struct affs_sb_info *sbi = AFFS_SB(sb);
         unsigned long delay;
 
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                return;
 
         spin_lock(&sbi->work_lock);
@@ -464,7 +464,7 @@ got_root:
          * not recommended.
          */
         if ((chksum == FS_DCFFS || chksum == MUFS_DCFFS || chksum == FS_DCOFS
-             || chksum == MUFS_DCOFS) && !(sb->s_flags & MS_RDONLY)) {
+             || chksum == MUFS_DCOFS) && !sb_rdonly(sb)) {
                 pr_notice("Dircache FS - mounting %s read only\n", sb->s_id);
                 sb->s_flags |= MS_RDONLY;
         }
@@ -596,7 +596,7 @@ affs_remount(struct super_block *sb, int *flags, char *data)
         memcpy(sbi->s_volume, volume, 32);
         spin_unlock(&sbi->symlink_lock);
 
-        if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
+        if ((bool)(*flags & MS_RDONLY) == sb_rdonly(sb))
                 return 0;
 
         if (*flags & MS_RDONLY)
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
index 4a4a5a366158..a92355cc453b 100644
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@ -838,7 +838,7 @@ befs_fill_super(struct super_block *sb, void *data, int silent)
 
         befs_debug(sb, "---> %s", __func__);
 
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 befs_warning(sb,
                              "No write support. Marking filesystem read-only");
                 sb->s_flags |= MS_RDONLY;
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index 7a93a3e1a847..7c655f9a7a50 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -704,7 +704,7 @@ static u64 __btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info)
         u64 result;
         int ret;
 
-        if (fs_info->sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(fs_info->sb))
                 return -EROFS;
 
         mutex_lock(&dev_replace->lock_finishing_cancel_unmount);
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index b6dc1d179d23..487bbe4fb3c6 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2478,7 +2478,7 @@ static int btrfs_replay_log(struct btrfs_fs_info *fs_info,
                 return ret;
         }
 
-        if (fs_info->sb->s_flags & MS_RDONLY) {
+        if (sb_rdonly(fs_info->sb)) {
                 ret = btrfs_commit_super(fs_info);
                 if (ret)
                         return ret;
@@ -2876,7 +2876,7 @@ int open_ctree(struct super_block *sb,
 
         features = btrfs_super_compat_ro_flags(disk_super) &
                 ~BTRFS_FEATURE_COMPAT_RO_SUPP;
-        if (!(sb->s_flags & MS_RDONLY) && features) {
+        if (!sb_rdonly(sb) && features) {
                 btrfs_err(fs_info,
         "cannot mount read-write because of unsupported optional features (%llx)",
                        features);
@@ -3038,7 +3038,7 @@ retry_root_backup:
                 goto fail_sysfs;
         }
 
-        if (!(sb->s_flags & MS_RDONLY) && !btrfs_check_rw_degradable(fs_info)) {
+        if (!sb_rdonly(sb) && !btrfs_check_rw_degradable(fs_info)) {
                 btrfs_warn(fs_info,
                 "writeable mount is not allowed due to too many missing devices");
                 goto fail_sysfs;
@@ -3097,7 +3097,7 @@ retry_root_backup:
         if (ret)
                 goto fail_qgroup;
 
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 ret = btrfs_cleanup_fs_roots(fs_info);
                 if (ret)
                         goto fail_qgroup;
@@ -3123,7 +3123,7 @@ retry_root_backup:
                 goto fail_qgroup;
         }
 
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 return 0;
 
         if (btrfs_test_opt(fs_info, CLEAR_CACHE) &&
@@ -3878,7 +3878,7 @@ void close_ctree(struct btrfs_fs_info *fs_info)
 
         cancel_work_sync(&fs_info->async_reclaim_work);
 
-        if (!(fs_info->sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(fs_info->sb)) {
                 /*
                  * If the cleaner thread is stopped and there are
                  * block groups queued for removal, the deletion will be
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 0f077c5db58e..3e5bb0cdd3cd 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2060,7 +2060,7 @@ int repair_eb_io_failure(struct btrfs_fs_info *fs_info,
         unsigned long i, num_pages = num_extent_pages(eb->start, eb->len);
         int ret = 0;
 
-        if (fs_info->sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(fs_info->sb))
                 return -EROFS;
 
         for (i = 0; i < num_pages; i++) {
@@ -2110,7 +2110,7 @@ int clean_io_failure(struct btrfs_fs_info *fs_info,
                         failrec->start);
                 goto out;
         }
-        if (fs_info->sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(fs_info->sb))
                 goto out;
 
         spin_lock(&io_tree->lock);
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 17ad018da0a2..128f3e58634f 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -5821,7 +5821,7 @@ struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry)
 
         if (!IS_ERR(inode) && root != sub_root) {
                 down_read(&fs_info->cleanup_work_sem);
-                if (!(inode->i_sb->s_flags & MS_RDONLY))
+                if (!sb_rdonly(inode->i_sb))
                         ret = btrfs_orphan_cleanup(sub_root);
                 up_read(&fs_info->cleanup_work_sem);
                 if (ret) {
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 0ebaf5d116bc..d6715c2bcdc4 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -4426,7 +4426,7 @@ static long btrfs_ioctl_dev_replace(struct btrfs_fs_info *fs_info,
 
         switch (p->cmd) {
         case BTRFS_IOCTL_DEV_REPLACE_CMD_START:
-                if (fs_info->sb->s_flags & MS_RDONLY) {
+                if (sb_rdonly(fs_info->sb)) {
                         ret = -EROFS;
                         goto out;
                 }
diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
index 9fb9896610e0..95bcc3cce78f 100644
--- a/fs/btrfs/root-tree.c
+++ b/fs/btrfs/root-tree.c
@@ -228,7 +228,7 @@ int btrfs_find_orphan_roots(struct btrfs_fs_info *fs_info)
         int ret;
         bool can_recover = true;
 
-        if (fs_info->sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(fs_info->sb))
                 can_recover = false;
 
         path = btrfs_alloc_path();
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 2b13d1a69f0b..35a128acfbd1 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -103,7 +103,7 @@ static void btrfs_handle_error(struct btrfs_fs_info *fs_info)
 {
         struct super_block *sb = fs_info->sb;
 
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 return;
 
         if (test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state)) {
@@ -139,7 +139,7 @@ void __btrfs_handle_fs_error(struct btrfs_fs_info *fs_info, const char *function
          * Special case: if the error is EROFS, and we're already
          * under MS_RDONLY, then it is safe here.
          */
-        if (errno == -EROFS && (sb->s_flags & MS_RDONLY))
+        if (errno == -EROFS && sb_rdonly(sb))
                 return;
 
 #ifdef CONFIG_PRINTK
@@ -1701,8 +1701,7 @@ static inline void btrfs_remount_cleanup(struct btrfs_fs_info *fs_info,
          * close or the filesystem is read only.
          */
         if (btrfs_raw_test_opt(old_opts, AUTO_DEFRAG) &&
-            (!btrfs_raw_test_opt(fs_info->mount_opt, AUTO_DEFRAG) ||
-             (fs_info->sb->s_flags & MS_RDONLY))) {
+            (!btrfs_raw_test_opt(fs_info->mount_opt, AUTO_DEFRAG) || sb_rdonly(fs_info->sb))) {
                 btrfs_cleanup_defrag_inodes(fs_info);
         }
 
@@ -1749,7 +1748,7 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data)
         btrfs_resize_thread_pool(fs_info,
                 fs_info->thread_pool_size, old_thread_pool_size);
 
-        if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
+        if ((bool)(*flags & MS_RDONLY) == sb_rdonly(sb))
                 goto out;
 
         if (*flags & MS_RDONLY) {
@@ -1850,7 +1849,7 @@ out:
 
 restore:
         /* We've hit an error - don't reset MS_RDONLY */
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 old_flags |= MS_RDONLY;
         sb->s_flags = old_flags;
         fs_info->mount_opt = old_opts;
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index 2b6d37c09a81..883881b16c86 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -120,7 +120,7 @@ static ssize_t btrfs_feature_attr_store(struct kobject *kobj,
         if (!fs_info)
                 return -EPERM;
 
-        if (fs_info->sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(fs_info->sb))
                 return -EROFS;
 
         ret = kstrtoul(skip_spaces(buf), 0, &val);
@@ -390,7 +390,7 @@ static ssize_t btrfs_label_store(struct kobject *kobj,
         if (!fs_info)
                 return -EPERM;
 
-        if (fs_info->sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(fs_info->sb))
                 return -EROFS;
 
         /*
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index c188256a367c..0e8f16c305df 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2324,7 +2324,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path
         int seeding_dev = 0;
         int ret = 0;
 
-        if ((sb->s_flags & MS_RDONLY) && !fs_info->fs_devices->seeding)
+        if (sb_rdonly(sb) && !fs_info->fs_devices->seeding)
                 return -EROFS;
 
         bdev = blkdev_get_by_path(device_path, FMODE_WRITE | FMODE_EXCL,
@@ -4053,7 +4053,7 @@ int btrfs_pause_balance(struct btrfs_fs_info *fs_info)
 
 int btrfs_cancel_balance(struct btrfs_fs_info *fs_info)
 {
-        if (fs_info->sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(fs_info->sb))
                 return -EROFS;
 
         mutex_lock(&fs_info->balance_mutex);
diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
index 3ff867f87d73..d9f001078e08 100644
--- a/fs/cachefiles/bind.c
+++ b/fs/cachefiles/bind.c
@@ -133,7 +133,7 @@ static int cachefiles_daemon_add_cache(struct cachefiles_cache *cache)
                 goto error_unsupported;
 
         ret = -EROFS;
-        if (root->d_sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(root->d_sb))
                 goto error_unsupported;
 
         /* determine the security of the on-disk cache as this governs
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index 9014479d0160..6b801186baa5 100644
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -568,8 +568,7 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags
          *   1) The lower mount is ro
          *   2) The ecryptfs_encrypted_view mount option is specified
          */
-        if (path.dentry->d_sb->s_flags & MS_RDONLY ||
-            mount_crypt_stat->flags & ECRYPTFS_ENCRYPTED_VIEW_ENABLED)
+        if (sb_rdonly(path.dentry->d_sb) || mount_crypt_stat->flags & ECRYPTFS_ENCRYPTED_VIEW_ENABLED)
                 s->s_flags |= MS_RDONLY;
 
         s->s_maxbytes = path.dentry->d_sb->s_maxbytes;
diff --git a/fs/efs/super.c b/fs/efs/super.c
index 368f7dd21c61..5c42f1e34a2f 100644
--- a/fs/efs/super.c
+++ b/fs/efs/super.c
@@ -306,7 +306,7 @@ static int efs_fill_super(struct super_block *s, void *d, int silent)
         }
         brelse(bh);
 
-        if (!(s->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(s)) {
 #ifdef DEBUG
                 pr_info("forcing read-only mode\n");
 #endif
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index fc18edd81815..1458706bd2ec 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -52,7 +52,7 @@ void ext2_error(struct super_block *sb, const char *function,
         struct ext2_sb_info *sbi = EXT2_SB(sb);
         struct ext2_super_block *es = sbi->s_es;
 
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 spin_lock(&sbi->s_lock);
                 sbi->s_mount_state |= EXT2_ERROR_FS;
                 es->s_state |= cpu_to_le16(EXT2_ERROR_FS);
@@ -151,7 +151,7 @@ static void ext2_put_super (struct super_block * sb)
                 ext2_xattr_destroy_cache(sbi->s_ea_block_cache);
                 sbi->s_ea_block_cache = NULL;
         }
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 struct ext2_super_block *es = sbi->s_es;
 
                 spin_lock(&sbi->s_lock);
@@ -943,8 +943,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
                         le32_to_cpu(features));
                 goto failed_mount;
         }
-        if (!(sb->s_flags & MS_RDONLY) &&
-            (features = EXT2_HAS_RO_COMPAT_FEATURE(sb, ~EXT2_FEATURE_RO_COMPAT_SUPP))){
+        if (!sb_rdonly(sb) && (features = EXT2_HAS_RO_COMPAT_FEATURE(sb, ~EXT2_FEATURE_RO_COMPAT_SUPP))){
                 ext2_msg(sb, KERN_ERR, "error: couldn't mount RDWR because of "
                        "unsupported optional features (%x)",
                        le32_to_cpu(features));
@@ -1173,7 +1172,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
         if (EXT2_HAS_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_HAS_JOURNAL))
                 ext2_msg(sb, KERN_WARNING,
                         "warning: mounting ext3 filesystem as ext2");
-        if (ext2_setup_super (sb, es, sb->s_flags & MS_RDONLY))
+        if (ext2_setup_super (sb, es, sb_rdonly(sb)))
                 sb->s_flags |= MS_RDONLY;
         ext2_write_super(sb);
         return 0;
@@ -1305,7 +1304,7 @@ static int ext2_unfreeze(struct super_block *sb)
 
 static void ext2_write_super(struct super_block *sb)
 {
-        if (!(sb->s_flags & MS_RDONLY))
+        if (!sb_rdonly(sb))
                 ext2_sync_fs(sb, 1);
 }
 
@@ -1343,7 +1342,7 @@ static int ext2_remount (struct super_block * sb, int * flags, char * data)
                          "dax flag with busy inodes while remounting");
                 sbi->s_mount_opt ^= EXT2_MOUNT_DAX;
         }
-        if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) {
+        if ((bool)(*flags & MS_RDONLY) == sb_rdonly(sb)) {
                 spin_unlock(&sbi->s_lock);
                 return 0;
         }
diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c
index dd106b1d5d89..5b342ac67d2e 100644
--- a/fs/ext4/ext4_jbd2.c
+++ b/fs/ext4/ext4_jbd2.c
@@ -47,7 +47,7 @@ static int ext4_journal_check_start(struct super_block *sb)
         if (unlikely(ext4_forced_shutdown(EXT4_SB(sb))))
                 return -EIO;
 
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 return -EROFS;
         WARN_ON(sb->s_writers.frozen == SB_FREEZE_COMPLETE);
         journal = EXT4_SB(sb)->s_journal;
diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 57dcaea762c3..da9c6948ad25 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -371,7 +371,7 @@ static int ext4_file_open(struct inode * inode, struct file * filp)
                 return -EIO;
 
         if (unlikely(!(sbi->s_mount_flags & EXT4_MF_MNTDIR_SAMPLED) &&
-                     !(sb->s_flags & MS_RDONLY))) {
+                     !sb_rdonly(sb))) {
                 sbi->s_mount_flags |= EXT4_MF_MNTDIR_SAMPLED;
                 /*
                  * Sample where the filesystem has been mounted and
diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c
index aae2c3971cef..f9230580a84b 100644
--- a/fs/ext4/fsync.c
+++ b/fs/ext4/fsync.c
@@ -107,7 +107,7 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
 
         trace_ext4_sync_file_enter(file, datasync);
 
-        if (inode->i_sb->s_flags & MS_RDONLY) {
+        if (sb_rdonly(inode->i_sb)) {
                 /* Make sure that we read updated s_mount_flags value */
                 smp_rmb();
                 if (EXT4_SB(inode->i_sb)->s_mount_flags & EXT4_MF_FS_ABORTED)
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 71e93a23cec3..ee823022aa34 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -1382,7 +1382,7 @@ int ext4_init_inode_table(struct super_block *sb, ext4_group_t group,
         int num, ret = 0, used_blks = 0;
 
         /* This should not happen, but just to be sure check this */
-        if (sb->s_flags & MS_RDONLY) {
+        if (sb_rdonly(sb)) {
                 ret = 1;
                 goto out;
         }
diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
index 77cdce1f17ce..84c54f15f1dd 100644
--- a/fs/ext4/mmp.c
+++ b/fs/ext4/mmp.c
@@ -185,7 +185,7 @@ static int kmmpd(void *data)
                         goto exit_thread;
                 }
 
-                if (sb->s_flags & MS_RDONLY) {
+                if (sb_rdonly(sb)) {
                         ext4_warning(sb, "kmmpd being stopped since filesystem "
                                      "has been remounted as readonly.");
                         goto exit_thread;
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 71b9a667e1bc..b104096fce9e 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -405,7 +405,7 @@ static void ext4_journal_commit_callback(journal_t *journal, transaction_t *txn)
 
 static void ext4_handle_error(struct super_block *sb)
 {
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 return;
 
         if (!test_opt(sb, ERRORS_CONT)) {
@@ -587,8 +587,7 @@ void __ext4_std_error(struct super_block *sb, const char *function,
         /* Special case: if the error is EROFS, and we're not already
          * inside a transaction, then there's really no point in logging
          * an error. */
-        if (errno == -EROFS && journal_current_handle() == NULL &&
-            (sb->s_flags & MS_RDONLY))
+        if (errno == -EROFS && journal_current_handle() == NULL && sb_rdonly(sb))
                 return;
 
         if (ext4_error_ratelimit(sb)) {
@@ -628,7 +627,7 @@ void __ext4_abort(struct super_block *sb, const char *function,
                sb->s_id, function, line, &vaf);
         va_end(args);
 
-        if ((sb->s_flags & MS_RDONLY) == 0) {
+        if (sb_rdonly(sb) == 0) {
                 ext4_msg(sb, KERN_CRIT, "Remounting filesystem read-only");
                 EXT4_SB(sb)->s_mount_flags |= EXT4_MF_FS_ABORTED;
                 /*
@@ -889,11 +888,11 @@ static void ext4_put_super(struct super_block *sb)
         ext4_mb_release(sb);
         ext4_ext_release(sb);
 
-        if (!(sb->s_flags & MS_RDONLY) && !aborted) {
+        if (!sb_rdonly(sb) && !aborted) {
                 ext4_clear_feature_journal_needs_recovery(sb);
                 es->s_state = cpu_to_le16(sbi->s_mount_state);
         }
-        if (!(sb->s_flags & MS_RDONLY))
+        if (!sb_rdonly(sb))
                 ext4_commit_super(sb, 1);
 
         for (i = 0; i < sbi->s_gdb_count; i++)
@@ -2100,7 +2099,7 @@ int ext4_seq_options_show(struct seq_file *seq, void *offset)
         struct super_block *sb = seq->private;
         int rc;
 
-        seq_puts(seq, (sb->s_flags & MS_RDONLY) ? "ro" : "rw");
+        seq_puts(seq, sb_rdonly(sb) ? "ro" : "rw");
         rc = _ext4_show_options(seq, sb, 1);
         seq_puts(seq, "\n");
         return rc;
@@ -2368,7 +2367,7 @@ static int ext4_check_descriptors(struct super_block *sb,
                                  "Checksum for group %u failed (%u!=%u)",
                                  i, le16_to_cpu(ext4_group_desc_csum(sb, i,
                                      gdp)), le16_to_cpu(gdp->bg_checksum));
-                        if (!(sb->s_flags & MS_RDONLY)) {
+                        if (!sb_rdonly(sb)) {
                                 ext4_unlock_group(sb, i);
                                 return 0;
                         }
@@ -3136,8 +3135,7 @@ int ext4_register_li_request(struct super_block *sb,
                 goto out;
         }
 
-        if (first_not_zeroed == ngroups ||
-            (sb->s_flags & MS_RDONLY) ||
+        if (first_not_zeroed == ngroups || sb_rdonly(sb) ||
             !test_opt(sb, INIT_INODE_TABLE))
                 goto out;
 
@@ -3683,7 +3681,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
          * previously didn't change the revision level when setting the flags,
          * so there is a chance incompat flags are set on a rev 0 filesystem.
          */
-        if (!ext4_feature_set_ok(sb, (sb->s_flags & MS_RDONLY)))
+        if (!ext4_feature_set_ok(sb, (sb_rdonly(sb))))
                 goto failed_mount;
 
         blocksize = BLOCK_SIZE << le32_to_cpu(es->s_log_block_size);
@@ -3812,12 +3810,12 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
                         sbi->s_hash_unsigned = 3;
                 else if ((i & EXT2_FLAGS_SIGNED_HASH) == 0) {
 #ifdef __CHAR_UNSIGNED__
-                        if (!(sb->s_flags & MS_RDONLY))
+                        if (!sb_rdonly(sb))
                                 es->s_flags |=
                                         cpu_to_le32(EXT2_FLAGS_UNSIGNED_HASH);
                         sbi->s_hash_unsigned = 3;
 #else
-                        if (!(sb->s_flags & MS_RDONLY))
+                        if (!sb_rdonly(sb))
                                 es->s_flags |=
                                         cpu_to_le32(EXT2_FLAGS_SIGNED_HASH);
 #endif
@@ -4017,7 +4015,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
         needs_recovery = (es->s_last_orphan != 0 ||
                           ext4_has_feature_journal_needs_recovery(sb));
 
-        if (ext4_has_feature_mmp(sb) && !(sb->s_flags & MS_RDONLY))
+        if (ext4_has_feature_mmp(sb) && !sb_rdonly(sb))
                 if (ext4_multi_mount_protect(sb, le64_to_cpu(es->s_mmp_block)))
                         goto failed_mount3a;
 
@@ -4029,7 +4027,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
                 err = ext4_load_journal(sb, es, journal_devnum);
                 if (err)
                         goto failed_mount3a;
-        } else if (test_opt(sb, NOLOAD) && !(sb->s_flags & MS_RDONLY) &&
+        } else if (test_opt(sb, NOLOAD) && !sb_rdonly(sb) &&
                    ext4_has_feature_journal_needs_recovery(sb)) {
                 ext4_msg(sb, KERN_ERR, "required journal recovery "
                        "suppressed and not mounted read-only");
@@ -4143,7 +4141,7 @@ no_journal:
                 goto failed_mount_wq;
         }
 
-        if (DUMMY_ENCRYPTION_ENABLED(sbi) && !(sb->s_flags & MS_RDONLY) &&
+        if (DUMMY_ENCRYPTION_ENABLED(sbi) && !sb_rdonly(sb) &&
             !ext4_has_feature_encrypt(sb)) {
                 ext4_set_feature_encrypt(sb);
                 ext4_commit_super(sb, 1);
@@ -4197,7 +4195,7 @@ no_journal:
                 goto failed_mount4;
         }
 
-        if (ext4_setup_super(sb, es, sb->s_flags & MS_RDONLY))
+        if (ext4_setup_super(sb, es, sb_rdonly(sb)))
                 sb->s_flags |= MS_RDONLY;
 
         /* determine the minimum size of new large inodes, if present */
@@ -4285,7 +4283,7 @@ no_journal:
 
 #ifdef CONFIG_QUOTA
         /* Enable quota usage during mount. */
-        if (ext4_has_feature_quota(sb) && !(sb->s_flags & MS_RDONLY)) {
+        if (ext4_has_feature_quota(sb) && !sb_rdonly(sb)) {
                 err = ext4_enable_quotas(sb);
                 if (err)
                         goto failed_mount8;
@@ -4609,7 +4607,7 @@ static int ext4_load_journal(struct super_block *sb,
          * can get read-write access to the device.
          */
         if (ext4_has_feature_journal_needs_recovery(sb)) {
-                if (sb->s_flags & MS_RDONLY) {
+                if (sb_rdonly(sb)) {
                         ext4_msg(sb, KERN_INFO, "INFO: recovery "
                                         "required on readonly filesystem");
                         if (really_read_only) {
@@ -4764,8 +4762,7 @@ static void ext4_mark_recovery_complete(struct super_block *sb,
         if (jbd2_journal_flush(journal) < 0)
                 goto out;
 
-        if (ext4_has_feature_journal_needs_recovery(sb) &&
-            sb->s_flags & MS_RDONLY) {
+        if (ext4_has_feature_journal_needs_recovery(sb) && sb_rdonly(sb)) {
                 ext4_clear_feature_journal_needs_recovery(sb);
                 ext4_commit_super(sb, 1);
         }
@@ -4821,7 +4818,7 @@ int ext4_force_commit(struct super_block *sb)
 {
         journal_t *journal;
 
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 return 0;
 
         journal = EXT4_SB(sb)->s_journal;
@@ -4886,7 +4883,7 @@ static int ext4_freeze(struct super_block *sb)
         int error = 0;
         journal_t *journal;
 
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 return 0;
 
         journal = EXT4_SB(sb)->s_journal;
@@ -4921,7 +4918,7 @@ out:
  */
 static int ext4_unfreeze(struct super_block *sb)
 {
-        if ((sb->s_flags & MS_RDONLY) || ext4_forced_shutdown(EXT4_SB(sb)))
+        if (sb_rdonly(sb) || ext4_forced_shutdown(EXT4_SB(sb)))
                 return 0;
 
         if (EXT4_SB(sb)->s_journal) {
@@ -5059,7 +5056,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
         if (*flags & MS_LAZYTIME)
                 sb->s_flags |= MS_LAZYTIME;
 
-        if ((*flags & MS_RDONLY) != (sb->s_flags & MS_RDONLY)) {
+        if ((bool)(*flags & MS_RDONLY) != sb_rdonly(sb)) {
                 if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED) {
                         err = -EROFS;
                         goto restore_opts;
@@ -5154,7 +5151,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
          * Reinitialize lazy itable initialization thread based on
          * current settings
          */
-        if ((sb->s_flags & MS_RDONLY) || !test_opt(sb, INIT_INODE_TABLE))
+        if (sb_rdonly(sb) || !test_opt(sb, INIT_INODE_TABLE))
                 ext4_unregister_li_request(sb);
         else {
                 ext4_group_t first_not_zeroed;
@@ -5731,7 +5728,7 @@ static inline int ext2_feature_set_ok(struct super_block *sb)
 {
         if (ext4_has_unknown_ext2_incompat_features(sb))
                 return 0;
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 return 1;
         if (ext4_has_unknown_ext2_ro_compat_features(sb))
                 return 0;
@@ -5762,7 +5759,7 @@ static inline int ext3_feature_set_ok(struct super_block *sb)
                 return 0;
         if (!ext4_has_feature_journal(sb))
                 return 0;
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 return 1;
         if (ext4_has_unknown_ext3_ro_compat_features(sb))
                 return 0;
diff --git a/fs/fat/fatent.c b/fs/fat/fatent.c
index 1d9a8c4e9de0..48b2336692f9 100644
--- a/fs/fat/fatent.c
+++ b/fs/fat/fatent.c
@@ -309,7 +309,7 @@ static void mark_fsinfo_dirty(struct super_block *sb)
 {
         struct msdos_sb_info *sbi = MSDOS_SB(sb);
 
-        if (sb->s_flags & MS_RDONLY || sbi->fat_bits != 32)
+        if (sb_rdonly(sb) || sbi->fat_bits != 32)
                 return;
 
         __mark_inode_dirty(sbi->fsinfo_inode, I_DIRTY_SYNC);
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index a2c05f2ada6d..30c52394a7ad 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -657,7 +657,7 @@ static void fat_set_state(struct super_block *sb,
         struct msdos_sb_info *sbi = MSDOS_SB(sb);
 
         /* do not change any thing if mounted read only */
-        if ((sb->s_flags & MS_RDONLY) && !force)
+        if (sb_rdonly(sb) && !force)
                 return;
 
         /* do not change state if fs was dirty */
@@ -787,7 +787,7 @@ static int fat_remount(struct super_block *sb, int *flags, char *data)
 
         /* make sure we update state on remount. */
         new_rdonly = *flags & MS_RDONLY;
-        if (new_rdonly != (sb->s_flags & MS_RDONLY)) {
+        if (new_rdonly != sb_rdonly(sb)) {
                 if (new_rdonly)
                         fat_set_state(sb, 0, 0);
                 else
diff --git a/fs/fat/misc.c b/fs/fat/misc.c
index 8a8698119ff7..acc3aa30ee54 100644
--- a/fs/fat/misc.c
+++ b/fs/fat/misc.c
@@ -32,7 +32,7 @@ void __fat_fs_error(struct super_block *sb, int report, const char *fmt, ...)
 
         if (opts->errors == FAT_ERRORS_PANIC)
                 panic("FAT-fs (%s): fs panic from previous error\n", sb->s_id);
-        else if (opts->errors == FAT_ERRORS_RO && !(sb->s_flags & MS_RDONLY)) {
+        else if (opts->errors == FAT_ERRORS_RO && !sb_rdonly(sb)) {
                 sb->s_flags |= MS_RDONLY;
                 fat_msg(sb, KERN_ERR, "Filesystem has been set read-only");
         }
diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
index dac6559e2195..cdd1c5f06f45 100644
--- a/fs/gfs2/glops.c
+++ b/fs/gfs2/glops.c
@@ -554,7 +554,7 @@ static void iopen_go_callback(struct gfs2_glock *gl, bool remote)
         struct gfs2_inode *ip = gl->gl_object;
         struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;
 
-        if (!remote || (sdp->sd_vfs->s_flags & MS_RDONLY))
+        if (!remote || sb_rdonly(sdp->sd_vfs))
                 return;
 
         if (gl->gl_demote_state == LM_ST_UNLOCKED &&
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index 84593587691d..a3711f543405 100644
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -1037,7 +1037,7 @@ void gfs2_online_uevent(struct gfs2_sbd *sdp)
         char ro[20];
         char spectator[20];
         char *envp[] = { ro, spectator, NULL };
-        sprintf(ro, "RDONLY=%d", (sb->s_flags & MS_RDONLY) ? 1 : 0);
+        sprintf(ro, "RDONLY=%d", sb_rdonly(sb));
         sprintf(spectator, "SPECTATOR=%d", sdp->sd_args.ar_spectator ? 1 : 0);
         kobject_uevent_env(&sdp->sd_kobj, KOBJ_ONLINE, envp);
 }
@@ -1179,7 +1179,7 @@ static int fill_super(struct super_block *sb, struct gfs2_args *args, int silent
                 goto fail_per_node;
         }
 
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 error = gfs2_make_fs_rw(sdp);
                 if (error) {
                         fs_err(sdp, "can't make FS RW: %d\n", error);
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index e647938432bd..e700fb162664 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -452,7 +452,7 @@ static int qd_fish(struct gfs2_sbd *sdp, struct gfs2_quota_data **qdp)
 
         *qdp = NULL;
 
-        if (sdp->sd_vfs->s_flags & MS_RDONLY)
+        if (sb_rdonly(sdp->sd_vfs))
                 return 0;
 
         spin_lock(&qd_lock);
diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c
index 113b6095a58d..9395a3db1a60 100644
--- a/fs/gfs2/recovery.c
+++ b/fs/gfs2/recovery.c
@@ -522,7 +522,7 @@ void gfs2_recover_func(struct work_struct *work)
                         if (!test_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags))
                                 ro = 1;
                 } else {
-                        if (sdp->sd_vfs->s_flags & MS_RDONLY) {
+                        if (sb_rdonly(sdp->sd_vfs)) {
                                 /* check if device itself is read-only */
                                 ro = bdev_read_only(sdp->sd_vfs->s_bdev);
                                 if (!ro) {
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 769841185ce5..8e54f2e3a304 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -893,7 +893,7 @@ restart:
         }
         spin_unlock(&sdp->sd_jindex_spin);
 
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 error = gfs2_make_fs_ro(sdp);
                 if (error)
                         gfs2_io_error(sdp);
@@ -1569,7 +1569,7 @@ static void gfs2_evict_inode(struct inode *inode)
                 return;
         }
 
-        if (inode->i_nlink || (sb->s_flags & MS_RDONLY))
+        if (inode->i_nlink || sb_rdonly(sb))
                 goto out;
 
         if (test_bit(GIF_ALLOC_FAILED, &ip->i_flags)) {
diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
index ca1f97ff898c..9eb9d0a1abd9 100644
--- a/fs/gfs2/sys.c
+++ b/fs/gfs2/sys.c
@@ -645,7 +645,7 @@ int gfs2_sys_fs_add(struct gfs2_sbd *sdp)
         char *envp[] = { ro, spectator, NULL };
         int sysfs_frees_sdp = 0;
 
-        sprintf(ro, "RDONLY=%d", (sb->s_flags & MS_RDONLY) ? 1 : 0);
+        sprintf(ro, "RDONLY=%d", sb_rdonly(sb));
         sprintf(spectator, "SPECTATOR=%d", sdp->sd_args.ar_spectator ? 1 : 0);
 
         sdp->sd_kobj.kset = gfs2_kset;
diff --git a/fs/hfs/mdb.c b/fs/hfs/mdb.c
index 482081bcdf70..894994d2c885 100644
--- a/fs/hfs/mdb.c
+++ b/fs/hfs/mdb.c
@@ -210,7 +210,7 @@ int hfs_mdb_get(struct super_block *sb)
                 pr_warn("filesystem is marked locked, mounting read-only.\n");
                 sb->s_flags |= MS_RDONLY;
         }
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 /* Mark the volume uncleanly unmounted in case we crash */
                 attrib &= cpu_to_be16(~HFS_SB_ATTRIB_UNMNT);
                 attrib |= cpu_to_be16(HFS_SB_ATTRIB_INCNSTNT);
@@ -259,7 +259,7 @@ void hfs_mdb_commit(struct super_block *sb)
 {
         struct hfs_mdb *mdb = HFS_SB(sb)->mdb;
 
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 return;
 
         lock_buffer(HFS_SB(sb)->mdb_bh);
@@ -334,7 +334,7 @@ void hfs_mdb_commit(struct super_block *sb)
 void hfs_mdb_close(struct super_block *sb)
 {
         /* update volume attributes */
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 return;
         HFS_SB(sb)->mdb->drAtrb |= cpu_to_be16(HFS_SB_ATTRIB_UNMNT);
         HFS_SB(sb)->mdb->drAtrb &= cpu_to_be16(~HFS_SB_ATTRIB_INCNSTNT);
diff --git a/fs/hfs/super.c b/fs/hfs/super.c
index bf6304a350a6..7e0d65e9586c 100644
--- a/fs/hfs/super.c
+++ b/fs/hfs/super.c
@@ -71,7 +71,7 @@ void hfs_mark_mdb_dirty(struct super_block *sb)
         struct hfs_sb_info *sbi = HFS_SB(sb);
         unsigned long delay;
 
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 return;
 
         spin_lock(&sbi->work_lock);
@@ -115,7 +115,7 @@ static int hfs_remount(struct super_block *sb, int *flags, char *data)
 {
         sync_filesystem(sb);
         *flags |= MS_NODIRATIME;
-        if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
+        if ((bool)(*flags & MS_RDONLY) == sb_rdonly(sb))
                 return 0;
         if (!(*flags & MS_RDONLY)) {
                 if (!(HFS_SB(sb)->mdb->drAtrb & cpu_to_be16(HFS_SB_ATTRIB_UNMNT))) {
diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
index 67aedf4c2e7c..e5bb2de2262a 100644
--- a/fs/hfsplus/super.c
+++ b/fs/hfsplus/super.c
@@ -264,7 +264,7 @@ void hfsplus_mark_mdb_dirty(struct super_block *sb)
         struct hfsplus_sb_info *sbi = HFSPLUS_SB(sb);
         unsigned long delay;
 
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 return;
 
         spin_lock(&sbi->work_lock);
@@ -284,7 +284,7 @@ static void hfsplus_put_super(struct super_block *sb)
 
         cancel_delayed_work_sync(&sbi->sync_work);
 
-        if (!(sb->s_flags & MS_RDONLY) && sbi->s_vhdr) {
+        if (!sb_rdonly(sb) && sbi->s_vhdr) {
                 struct hfsplus_vh *vhdr = sbi->s_vhdr;
 
                 vhdr->modify_date = hfsp_now2mt();
@@ -329,7 +329,7 @@ static int hfsplus_statfs(struct dentry *dentry, struct kstatfs *buf)
 static int hfsplus_remount(struct super_block *sb, int *flags, char *data)
 {
         sync_filesystem(sb);
-        if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
+        if ((bool)(*flags & MS_RDONLY) == sb_rdonly(sb))
                 return 0;
         if (!(*flags & MS_RDONLY)) {
                 struct hfsplus_vh *vhdr = HFSPLUS_SB(sb)->s_vhdr;
@@ -462,7 +462,7 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)
                 pr_warn("Filesystem is marked locked, mounting read-only.\n");
                 sb->s_flags |= MS_RDONLY;
         } else if ((vhdr->attributes & cpu_to_be32(HFSPLUS_VOL_JOURNALED)) &&
-                        !(sb->s_flags & MS_RDONLY)) {
+                        !sb_rdonly(sb)) {
                 pr_warn("write access to a journaled filesystem is not supported, use the force option at your own risk, mounting read-only.\n");
                 sb->s_flags |= MS_RDONLY;
         }
@@ -535,7 +535,7 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)
         } else
                 hfs_find_exit(&fd);
 
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 /*
                  * H+LX == hfsplusutils, H+Lx == this driver, H+lx is unused
                  * all three are registered with Apple for our use
diff --git a/fs/hpfs/alloc.c b/fs/hpfs/alloc.c
index d6a4b55d2ab0..098bf0f4f386 100644
--- a/fs/hpfs/alloc.c
+++ b/fs/hpfs/alloc.c
@@ -538,7 +538,7 @@ int hpfs_trim_fs(struct super_block *s, u64 start, u64 end, u64 minlen, unsigned
                 return 0;
         if (start < sbi->sb_dirband_start + sbi->sb_dirband_size && end > sbi->sb_dirband_start) {
                 hpfs_lock(s);
-                if (s->s_flags & MS_RDONLY) {
+                if (sb_rdonly(s)) {
                         err = -EROFS;
                         goto unlock_1;
                 }
@@ -559,7 +559,7 @@ unlock_1:
         end_bmp = (end + 0x3fff) >> 14;
         while (start_bmp < end_bmp && !err) {
                 hpfs_lock(s);
-                if (s->s_flags & MS_RDONLY) {
+                if (sb_rdonly(s)) {
                         err = -EROFS;
                         goto unlock_2;
                 }
diff --git a/fs/hpfs/dir.c b/fs/hpfs/dir.c
index 7b9150c2e75c..fa6bbb4f509f 100644
--- a/fs/hpfs/dir.c
+++ b/fs/hpfs/dir.c
@@ -264,7 +264,7 @@ struct dentry *hpfs_lookup(struct inode *dir, struct dentry *dentry, unsigned in
         hpfs_result = hpfs_i(result);
         if (!de->directory) hpfs_result->i_parent_dir = dir->i_ino;
 
-        if (de->has_acl || de->has_xtd_perm) if (!(dir->i_sb->s_flags & MS_RDONLY)) {
+        if (de->has_acl || de->has_xtd_perm) if (!sb_rdonly(dir->i_sb)) {
                 hpfs_error(result->i_sb, "ACLs or XPERM found. This is probably HPFS386. This driver doesn't support it now. Send me some info on these structures");
                 goto bail1;
         }
diff --git a/fs/hpfs/super.c b/fs/hpfs/super.c
index 82067ca22f2b..1516fb4e28f4 100644
--- a/fs/hpfs/super.c
+++ b/fs/hpfs/super.c
@@ -21,7 +21,7 @@
 
 static void mark_dirty(struct super_block *s, int remount)
 {
-        if (hpfs_sb(s)->sb_chkdsk && (remount || !(s->s_flags & MS_RDONLY))) {
+        if (hpfs_sb(s)->sb_chkdsk && (remount || !sb_rdonly(s))) {
                 struct buffer_head *bh;
                 struct hpfs_spare_block *sb;
                 if ((sb = hpfs_map_sector(s, 17, &bh, 0))) {
@@ -41,7 +41,7 @@ static void unmark_dirty(struct super_block *s)
 {
         struct buffer_head *bh;
         struct hpfs_spare_block *sb;
-        if (s->s_flags & MS_RDONLY) return;
+        if (sb_rdonly(s)) return;
         sync_blockdev(s->s_bdev);
         if ((sb = hpfs_map_sector(s, 17, &bh, 0))) {
                 sb->dirty = hpfs_sb(s)->sb_chkdsk > 1 - hpfs_sb(s)->sb_was_error;
@@ -73,14 +73,14 @@ void hpfs_error(struct super_block *s, const char *fmt, ...)
                         mark_dirty(s, 0);
                         panic("HPFS panic");
                 } else if (hpfs_sb(s)->sb_err == 1) {
-                        if (s->s_flags & MS_RDONLY)
+                        if (sb_rdonly(s))
                                 pr_cont("; already mounted read-only\n");
                         else {
                                 pr_cont("; remounting read-only\n");
                                 mark_dirty(s, 0);
                                 s->s_flags |= MS_RDONLY;
                         }
-                } else if (s->s_flags & MS_RDONLY)
+                } else if (sb_rdonly(s))
                                 pr_cont("; going on - but anything won't be destroyed because it's read-only\n");
                 else
                         pr_cont("; corrupted filesystem mounted read/write - your computer will explode within 20 seconds ... but you wanted it so!\n");
@@ -607,8 +607,7 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent)
         }
 
         /* Check version */
-        if (!(s->s_flags & MS_RDONLY) &&
-              superblock->funcversion != 2 && superblock->funcversion != 3) {
+        if (!sb_rdonly(s) && superblock->funcversion != 2 && superblock->funcversion != 3) {
                 pr_err("Bad version %d,%d. Mount readonly to go around\n",
                         (int)superblock->version, (int)superblock->funcversion);
                 pr_err("please try recent version of HPFS driver at http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/hpfs/index-e.cgi and if it still can't understand this format, contact author - mikulas@artax.karlin.mff.cuni.cz\n");
@@ -666,7 +665,7 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent)
                 hpfs_error(s, "improperly stopped");
         }
 
-        if (!(s->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(s)) {
                 spareblock->dirty = 1;
                 spareblock->old_wrote = 0;
                 mark_buffer_dirty(bh2);
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
index f1ed935322db..db692f554158 100644
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -737,7 +737,7 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent)
 
 root_found:
         /* We don't support read-write mounts */
-        if (!(s->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(s)) {
                 error = -EACCES;
                 goto out_freebh;
         }
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index 76fa814df3d1..e96c6b05e43e 100644
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@ -395,14 +395,14 @@ int jffs2_do_remount_fs(struct super_block *sb, int *flags, char *data)
 {
         struct jffs2_sb_info *c = JFFS2_SB_INFO(sb);
 
-        if (c->flags & JFFS2_SB_FLAG_RO && !(sb->s_flags & MS_RDONLY))
+        if (c->flags & JFFS2_SB_FLAG_RO && !sb_rdonly(sb))
                 return -EROFS;
 
         /* We stop if it was running, then restart if it needs to.
            This also catches the case where it was stopped and this
            is just a remount to restart it.
            Flush the writebuffer, if neccecary, else we loose it */
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 jffs2_stop_garbage_collect_thread(c);
                 mutex_lock(&c->alloc_sem);
                 jffs2_flush_wbuf_pad(c);
@@ -590,7 +590,7 @@ int jffs2_do_fill_super(struct super_block *sb, void *data, int silent)
         sb->s_blocksize = PAGE_SIZE;
         sb->s_blocksize_bits = PAGE_SHIFT;
         sb->s_magic = JFFS2_SUPER_MAGIC;
-        if (!(sb->s_flags & MS_RDONLY))
+        if (!sb_rdonly(sb))
                 jffs2_start_garbage_collect_thread(c);
         return 0;
 
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
index 5ef21f4c4c77..153f1c6eb169 100644
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -342,7 +342,7 @@ static void jffs2_put_super (struct super_block *sb)
 static void jffs2_kill_sb(struct super_block *sb)
 {
         struct jffs2_sb_info *c = JFFS2_SB_INFO(sb);
-        if (!(sb->s_flags & MS_RDONLY))
+        if (!sb_rdonly(sb))
                 jffs2_stop_garbage_collect_thread(c);
         kill_mtd_super(sb);
         kfree(c);
diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
index 48d9522e209c..2cfe487708e0 100644
--- a/fs/jffs2/wbuf.c
+++ b/fs/jffs2/wbuf.c
@@ -1162,7 +1162,7 @@ static void delayed_wbuf_sync(struct work_struct *work)
         struct jffs2_sb_info *c = work_to_sb(work);
         struct super_block *sb = OFNI_BS_2SFFJ(c);
 
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 jffs2_dbg(1, "%s()\n", __func__);
                 jffs2_flush_wbuf_gc(c, 0);
         }
@@ -1173,7 +1173,7 @@ void jffs2_dirty_trigger(struct jffs2_sb_info *c)
         struct super_block *sb = OFNI_BS_2SFFJ(c);
         unsigned long delay;
 
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 return;
 
         delay = msecs_to_jiffies(dirty_writeback_interval * 10);
diff --git a/fs/jfs/jfs_mount.c b/fs/jfs/jfs_mount.c
index 9895595fd2f2..d8658607bf46 100644
--- a/fs/jfs/jfs_mount.c
+++ b/fs/jfs/jfs_mount.c
@@ -362,7 +362,7 @@ static int chkSuper(struct super_block *sb)
 
         /* validate fs state */
         if (j_sb->s_state != cpu_to_le32(FM_CLEAN) &&
-            !(sb->s_flags & MS_RDONLY)) {
+            !sb_rdonly(sb)) {
                 jfs_err("jfs_mount: Mount Failure: File System Dirty.");
                 rc = -EINVAL;
                 goto out;
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 60726ae7cf26..2f14677169c3 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -76,7 +76,7 @@ static void jfs_handle_error(struct super_block *sb)
 {
         struct jfs_sb_info *sbi = JFS_SBI(sb);
 
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 return;
 
         updateSuper(sb, FM_DIRTY);
@@ -468,7 +468,7 @@ static int jfs_remount(struct super_block *sb, int *flags, char *data)
                 return -EINVAL;
 
         if (newLVSize) {
-                if (sb->s_flags & MS_RDONLY) {
+                if (sb_rdonly(sb)) {
                         pr_err("JFS: resize requires volume to be mounted read-write\n");
                         return -EROFS;
                 }
@@ -477,7 +477,7 @@ static int jfs_remount(struct super_block *sb, int *flags, char *data)
                         return rc;
         }
 
-        if ((sb->s_flags & MS_RDONLY) && !(*flags & MS_RDONLY)) {
+        if (sb_rdonly(sb) && !(*flags & MS_RDONLY)) {
                 /*
                  * Invalidate any previously read metadata.  fsck may have
                  * changed the on-disk data since we mounted r/o
@@ -493,7 +493,7 @@ static int jfs_remount(struct super_block *sb, int *flags, char *data)
                 dquot_resume(sb, -1);
                 return ret;
         }
-        if ((!(sb->s_flags & MS_RDONLY)) && (*flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb) && (*flags & MS_RDONLY)) {
                 rc = dquot_suspend(sb, -1);
                 if (rc < 0)
                         return rc;
@@ -502,7 +502,7 @@ static int jfs_remount(struct super_block *sb, int *flags, char *data)
                 return rc;
         }
         if ((JFS_SBI(sb)->flag & JFS_NOINTEGRITY) != (flag & JFS_NOINTEGRITY))
-                if (!(sb->s_flags & MS_RDONLY)) {
+                if (!sb_rdonly(sb)) {
                         rc = jfs_umount_rw(sb);
                         if (rc)
                                 return rc;
@@ -592,7 +592,7 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent)
                         jfs_err("jfs_mount failed w/return code = %d", rc);
                 goto out_mount_failed;
         }
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 sbi->log = NULL;
         else {
                 rc = jfs_mount_rw(sb, 0);
@@ -652,7 +652,7 @@ static int jfs_freeze(struct super_block *sb)
         struct jfs_log *log = sbi->log;
         int rc = 0;
 
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 txQuiesce(sb);
                 rc = lmLogShutdown(log);
                 if (rc) {
@@ -682,7 +682,7 @@ static int jfs_unfreeze(struct super_block *sb)
         struct jfs_log *log = sbi->log;
         int rc = 0;
 
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 rc = updateSuper(sb, FM_MOUNT);
                 if (rc) {
                         jfs_error(sb, "updateSuper failed\n");
diff --git a/fs/minix/inode.c b/fs/minix/inode.c
index 6ac76b0434e9..b6829d679643 100644
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
@@ -42,7 +42,7 @@ static void minix_put_super(struct super_block *sb)
         int i;
         struct minix_sb_info *sbi = minix_sb(sb);
 
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 if (sbi->s_version != MINIX_V3)  /* s_state is now out from V3 sb */
                         sbi->s_ms->s_state = sbi->s_mount_state;
                 mark_buffer_dirty(sbi->s_sbh);
@@ -125,7 +125,7 @@ static int minix_remount (struct super_block * sb, int * flags, char * data)
 
         sync_filesystem(sb);
         ms = sbi->s_ms;
-        if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
+        if ((bool)(*flags & MS_RDONLY) == sb_rdonly(sb))
                 return 0;
         if (*flags & MS_RDONLY) {
                 if (ms->s_state & MINIX_VALID_FS ||
@@ -293,7 +293,7 @@ static int minix_fill_super(struct super_block *s, void *data, int silent)
         if (!s->s_root)
                 goto out_no_root;
 
-        if (!(s->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(s)) {
                 if (sbi->s_version != MINIX_V3) /* s_state is now out from V3 sb */
                         ms->s_state &= ~MINIX_VALID_FS;
                 mark_buffer_dirty(bh);
diff --git a/fs/namei.c b/fs/namei.c
index 1180f9c58093..c75ea03ca147 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -447,8 +447,7 @@ static int sb_permission(struct super_block *sb, struct inode *inode, int mask)
                 umode_t mode = inode->i_mode;
 
                 /* Nobody gets write access to a read-only fs. */
-                if ((sb->s_flags & MS_RDONLY) &&
-                    (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)))
+                if (sb_rdonly(sb) && (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)))
                         return -EROFS;
         }
         return 0;
diff --git a/fs/namespace.c b/fs/namespace.c
index df0f7521979a..e48ad0192d81 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -275,7 +275,7 @@ int __mnt_is_readonly(struct vfsmount *mnt)
 {
         if (mnt->mnt_flags & MNT_READONLY)
                 return 1;
-        if (mnt->mnt_sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(mnt->mnt_sb))
                 return 1;
         return 0;
 }
@@ -1029,7 +1029,7 @@ vfs_kern_mount(struct file_system_type *type, int flags, const char *name, void
         if (!mnt)
                 return ERR_PTR(-ENOMEM);
 
-        if (flags & MS_KERNMOUNT)
+        if (flags & SB_KERNMOUNT)
                 mnt->mnt.mnt_flags = MNT_INTERNAL;
 
         root = mount_fs(type, flags, name, data);
@@ -1061,7 +1061,7 @@ vfs_submount(const struct dentry *mountpoint, struct file_system_type *type,
         if (mountpoint->d_sb->s_user_ns != &init_user_ns)
                 return ERR_PTR(-EPERM);
 
-        return vfs_kern_mount(type, MS_SUBMOUNT, name, data);
+        return vfs_kern_mount(type, SB_SUBMOUNT, name, data);
 }
 EXPORT_SYMBOL_GPL(vfs_submount);
 
@@ -1592,8 +1592,8 @@ static int do_umount(struct mount *mnt, int flags)
                 if (!capable(CAP_SYS_ADMIN))
                         return -EPERM;
                 down_write(&sb->s_umount);
-                if (!(sb->s_flags & MS_RDONLY))
-                        retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
+                if (!sb_rdonly(sb))
+                        retval = do_remount_sb(sb, SB_RDONLY, NULL, 0);
                 up_write(&sb->s_umount);
                 return retval;
         }
@@ -2117,7 +2117,7 @@ static void unlock_mount(struct mountpoint *where)
 
 static int graft_tree(struct mount *mnt, struct mount *p, struct mountpoint *mp)
 {
-        if (mnt->mnt.mnt_sb->s_flags & MS_NOUSER)
+        if (mnt->mnt.mnt_sb->s_flags & SB_NOUSER)
                 return -EINVAL;
 
         if (d_is_dir(mp->m_dentry) !=
@@ -2131,9 +2131,9 @@ static int graft_tree(struct mount *mnt, struct mount *p, struct mountpoint *mp)
  * Sanity check the flags to change_mnt_propagation.
  */
 
-static int flags_to_propagation_type(int flags)
+static int flags_to_propagation_type(int ms_flags)
 {
-        int type = flags & ~(MS_REC | MS_SILENT);
+        int type = ms_flags & ~(MS_REC | MS_SILENT);
 
         /* Fail if any non-propagation flags are set */
         if (type & ~(MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
@@ -2147,18 +2147,18 @@ static int flags_to_propagation_type(int flags)
 /*
  * recursively change the type of the mountpoint.
  */
-static int do_change_type(struct path *path, int flag)
+static int do_change_type(struct path *path, int ms_flags)
 {
         struct mount *m;
         struct mount *mnt = real_mount(path->mnt);
-        int recurse = flag & MS_REC;
+        int recurse = ms_flags & MS_REC;
         int type;
         int err = 0;
 
         if (path->dentry != path->mnt->mnt_root)
                 return -EINVAL;
 
-        type = flags_to_propagation_type(flag);
+        type = flags_to_propagation_type(ms_flags);
         if (!type)
                 return -EINVAL;
 
@@ -2280,8 +2280,8 @@ static int change_mount_flags(struct vfsmount *mnt, int ms_flags)
  * If you've mounted a non-root directory somewhere and want to do remount
  * on it - tough luck.
  */
-static int do_remount(struct path *path, int flags, int mnt_flags,
-                      void *data)
+static int do_remount(struct path *path, int ms_flags, int sb_flags,
+                      int mnt_flags, void *data)
 {
         int err;
         struct super_block *sb = path->mnt->mnt_sb;
@@ -2325,12 +2325,12 @@ static int do_remount(struct path *path, int flags, int mnt_flags,
                 return err;
 
         down_write(&sb->s_umount);
-        if (flags & MS_BIND)
-                err = change_mount_flags(path->mnt, flags);
+        if (ms_flags & MS_BIND)
+                err = change_mount_flags(path->mnt, ms_flags);
         else if (!capable(CAP_SYS_ADMIN))
                 err = -EPERM;
         else
-                err = do_remount_sb(sb, flags, data, 0);
+                err = do_remount_sb(sb, sb_flags, data, 0);
         if (!err) {
                 lock_mount_hash();
                 mnt_flags |= mnt->mnt.mnt_flags & ~MNT_USER_SETTABLE_MASK;
@@ -2495,7 +2495,7 @@ static bool mount_too_revealing(struct vfsmount *mnt, int *new_mnt_flags);
  * create a new mount for userspace and request it to be added into the
  * namespace's tree
  */
-static int do_new_mount(struct path *path, const char *fstype, int flags,
+static int do_new_mount(struct path *path, const char *fstype, int sb_flags,
                         int mnt_flags, const char *name, void *data)
 {
         struct file_system_type *type;
@@ -2509,7 +2509,7 @@ static int do_new_mount(struct path *path, const char *fstype, int flags,
         if (!type)
                 return -ENODEV;
 
-        mnt = vfs_kern_mount(type, flags, name, data);
+        mnt = vfs_kern_mount(type, sb_flags, name, data);
         if (!IS_ERR(mnt) && (type->fs_flags & FS_HAS_SUBTYPE) &&
             !mnt->mnt_sb->s_subtype)
                 mnt = fs_set_subtype(mnt, fstype);
@@ -2764,8 +2764,8 @@ long do_mount(const char *dev_name, const char __user *dir_name,
                 const char *type_page, unsigned long flags, void *data_page)
 {
         struct path path;
+        unsigned int mnt_flags = 0, sb_flags;
         int retval = 0;
-        int mnt_flags = 0;
 
         /* Discard magic */
         if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
@@ -2775,6 +2775,9 @@ long do_mount(const char *dev_name, const char __user *dir_name,
         if (data_page)
                 ((char *)data_page)[PAGE_SIZE - 1] = 0;
 
+        if (flags & MS_NOUSER)
+                return -EINVAL;
+
         /* ... and get the mountpoint */
         retval = user_path(dir_name, &path);
         if (retval)
@@ -2784,7 +2787,7 @@ long do_mount(const char *dev_name, const char __user *dir_name,
                                    type_page, flags, data_page);
         if (!retval && !may_mount())
                 retval = -EPERM;
-        if (!retval && (flags & MS_MANDLOCK) && !may_mandlock())
+        if (!retval && (flags & SB_MANDLOCK) && !may_mandlock())
                 retval = -EPERM;
         if (retval)
                 goto dput_out;
@@ -2806,7 +2809,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 & MS_RDONLY)
+        if (flags & SB_RDONLY)
                 mnt_flags |= MNT_READONLY;
 
         /* The default atime for remount is preservation */
@@ -2817,12 +2820,15 @@ long do_mount(const char *dev_name, const char __user *dir_name,
                 mnt_flags |= path.mnt->mnt_flags & MNT_ATIME_MASK;
         }
 
-        flags &= ~(MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_ACTIVE | MS_BORN |
-                   MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
-                   MS_STRICTATIME | MS_NOREMOTELOCK | MS_SUBMOUNT);
+        sb_flags = flags & (SB_RDONLY |
+                            SB_SYNCHRONOUS |
+                            SB_MANDLOCK |
+                            SB_DIRSYNC |
+                            SB_SILENT |
+                            SB_POSIXACL);
 
         if (flags & MS_REMOUNT)
-                retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
+                retval = do_remount(&path, flags, sb_flags, mnt_flags,
                                     data_page);
         else if (flags & MS_BIND)
                 retval = do_loopback(&path, dev_name, flags & MS_REC);
@@ -2831,7 +2837,7 @@ long do_mount(const char *dev_name, const char __user *dir_name,
         else if (flags & MS_MOVE)
                 retval = do_move_mount(&path, dev_name);
         else
-                retval = do_new_mount(&path, type_page, flags, mnt_flags,
+                retval = do_new_mount(&path, type_page, sb_flags, mnt_flags,
                                       dev_name, data_page);
 dput_out:
         path_put(&path);
@@ -3281,7 +3287,7 @@ void put_mnt_ns(struct mnt_namespace *ns)
 struct vfsmount *kern_mount_data(struct file_system_type *type, void *data)
 {
         struct vfsmount *mnt;
-        mnt = vfs_kern_mount(type, MS_KERNMOUNT, type->name, data);
+        mnt = vfs_kern_mount(type, SB_KERNMOUNT, type->name, data);
         if (!IS_ERR(mnt)) {
                 /*
                  * it is a longterm mount, don't release mnt until
@@ -3358,7 +3364,7 @@ static bool mnt_already_visible(struct mnt_namespace *ns, struct vfsmount *new,
                 mnt_flags = mnt->mnt.mnt_flags;
 
                 /* Don't miss readonly hidden in the superblock flags */
-                if (mnt->mnt.mnt_sb->s_flags & MS_RDONLY)
+                if (sb_rdonly(mnt->mnt.mnt_sb))
                         mnt_flags |= MNT_LOCK_READONLY;
 
                 /* Verify the mount flags are equal to or more permissive
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 6b179af59b92..c9d24bae3025 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -812,7 +812,7 @@ int nfs_show_stats(struct seq_file *m, struct dentry *root)
          * Display all mount option settings
          */
         seq_printf(m, "\n\topts:\t");
-        seq_puts(m, root->d_sb->s_flags & MS_RDONLY ? "ro" : "rw");
+        seq_puts(m, sb_rdonly(root->d_sb) ? "ro" : "rw");
         seq_puts(m, root->d_sb->s_flags & MS_SYNCHRONOUS ? ",sync" : "");
         seq_puts(m, root->d_sb->s_flags & MS_NOATIME ? ",noatime" : "");
         seq_puts(m, root->d_sb->s_flags & MS_NODIRATIME ? ",nodiratime" : "");
diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index 7ffe71a8dfb9..6a612d832e7d 100644
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -174,7 +174,7 @@ static int nilfs_writepages(struct address_space *mapping,
         struct inode *inode = mapping->host;
         int err = 0;
 
-        if (inode->i_sb->s_flags & MS_RDONLY) {
+        if (sb_rdonly(inode->i_sb)) {
                 nilfs_clear_dirty_pages(mapping, false);
                 return -EROFS;
         }
@@ -191,7 +191,7 @@ static int nilfs_writepage(struct page *page, struct writeback_control *wbc)
         struct inode *inode = page->mapping->host;
         int err;
 
-        if (inode->i_sb->s_flags & MS_RDONLY) {
+        if (sb_rdonly(inode->i_sb)) {
                 /*
                  * It means that filesystem was remounted in read-only
                  * mode because of error or metadata corruption. But we
diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c
index 98835ed6bef4..c6bc1033e7d2 100644
--- a/fs/nilfs2/mdt.c
+++ b/fs/nilfs2/mdt.c
@@ -413,7 +413,7 @@ nilfs_mdt_write_page(struct page *page, struct writeback_control *wbc)
         struct super_block *sb;
         int err = 0;
 
-        if (inode && (inode->i_sb->s_flags & MS_RDONLY)) {
+        if (inode && sb_rdonly(inode->i_sb)) {
                 /*
                  * It means that filesystem was remounted in read-only
                  * mode because of error or metadata corruption. But we
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c
index 926682981d61..4fc018dfcfae 100644
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@ -136,7 +136,7 @@ void __nilfs_error(struct super_block *sb, const char *function,
 
         va_end(args);
 
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 nilfs_set_error(sb);
 
                 if (nilfs_test_opt(nilfs, ERRORS_RO)) {
@@ -478,7 +478,7 @@ static void nilfs_put_super(struct super_block *sb)
 
         nilfs_detach_log_writer(sb);
 
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 down_write(&nilfs->ns_sem);
                 nilfs_cleanup_super(sb);
                 up_write(&nilfs->ns_sem);
@@ -578,7 +578,7 @@ static int nilfs_freeze(struct super_block *sb)
         struct the_nilfs *nilfs = sb->s_fs_info;
         int err;
 
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 return 0;
 
         /* Mark super block clean */
@@ -592,7 +592,7 @@ static int nilfs_unfreeze(struct super_block *sb)
 {
         struct the_nilfs *nilfs = sb->s_fs_info;
 
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 return 0;
 
         down_write(&nilfs->ns_sem);
@@ -898,7 +898,7 @@ int nilfs_check_feature_compatibility(struct super_block *sb,
         }
         features = le64_to_cpu(sbp->s_feature_compat_ro) &
                 ~NILFS_FEATURE_COMPAT_RO_SUPP;
-        if (!(sb->s_flags & MS_RDONLY) && features) {
+        if (!sb_rdonly(sb) && features) {
                 nilfs_msg(sb, KERN_ERR,
                           "couldn't mount RDWR because of unsupported optional features (%llx)",
                           (unsigned long long)features);
@@ -1083,7 +1083,7 @@ nilfs_fill_super(struct super_block *sb, void *data, int silent)
                 goto failed_unload;
         }
 
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 err = nilfs_attach_log_writer(sb, fsroot);
                 if (err)
                         goto failed_checkpoint;
@@ -1095,7 +1095,7 @@ nilfs_fill_super(struct super_block *sb, void *data, int silent)
 
         nilfs_put_root(fsroot);
 
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 down_write(&nilfs->ns_sem);
                 nilfs_setup_super(sb, true);
                 up_write(&nilfs->ns_sem);
@@ -1144,7 +1144,7 @@ static int nilfs_remount(struct super_block *sb, int *flags, char *data)
                 goto restore_opts;
         }
 
-        if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
+        if ((bool)(*flags & MS_RDONLY) == sb_rdonly(sb))
                 goto out;
         if (*flags & MS_RDONLY) {
                 /* Shutting down log writer */
@@ -1338,8 +1338,7 @@ nilfs_mount(struct file_system_type *fs_type, int flags,
                         if ((flags ^ s->s_flags) & MS_RDONLY) {
                                 nilfs_msg(s, KERN_ERR,
                                           "the device already has a %s mount.",
-                                          (s->s_flags & MS_RDONLY) ?
-                                          "read-only" : "read/write");
+                                          sb_rdonly(s) ? "read-only" : "read/write");
                                 err = -EBUSY;
                                 goto failed_super;
                         }
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
index ecb49870a680..3f70f041dbe9 100644
--- a/fs/ntfs/super.c
+++ b/fs/ntfs/super.c
@@ -487,7 +487,7 @@ static int ntfs_remount(struct super_block *sb, int *flags, char *opt)
          * When remounting read-only, mark the volume clean if no volume errors
          * have occurred.
          */
-        if ((sb->s_flags & MS_RDONLY) && !(*flags & MS_RDONLY)) {
+        if (sb_rdonly(sb) && !(*flags & MS_RDONLY)) {
                 static const char *es = ".  Cannot remount read-write.";
 
                 /* Remounting read-write. */
@@ -548,7 +548,7 @@ static int ntfs_remount(struct super_block *sb, int *flags, char *opt)
                         NVolSetErrors(vol);
                         return -EROFS;
                 }
-        } else if (!(sb->s_flags & MS_RDONLY) && (*flags & MS_RDONLY)) {
+        } else if (!sb_rdonly(sb) && (*flags & MS_RDONLY)) {
                 /* Remounting read-only. */
                 if (!NVolErrors(vol)) {
                         if (ntfs_clear_volume_flags(vol, VOLUME_IS_DIRTY))
@@ -732,7 +732,7 @@ hotfix_primary_boot_sector:
                  * on a large sector device contains the whole boot loader or
                  * just the first 512 bytes).
                  */
-                if (!(sb->s_flags & MS_RDONLY)) {
+                if (!sb_rdonly(sb)) {
                         ntfs_warning(sb, "Hot-fix: Recovering invalid primary "
                                         "boot sector from backup copy.");
                         memcpy(bh_primary->b_data, bh_backup->b_data,
@@ -1789,7 +1789,7 @@ static bool load_system_files(ntfs_volume *vol)
                 static const char *es3 = ".  Run ntfsfix and/or chkdsk.";
 
                 /* If a read-write mount, convert it to a read-only mount. */
-                if (!(sb->s_flags & MS_RDONLY)) {
+                if (!sb_rdonly(sb)) {
                         if (!(vol->on_errors & (ON_ERRORS_REMOUNT_RO |
                                         ON_ERRORS_CONTINUE))) {
                                 ntfs_error(sb, "%s and neither on_errors="
@@ -1928,7 +1928,7 @@ get_ctx_vol_failed:
                                         (unsigned)le16_to_cpu(vol->vol_flags));
                 }
                 /* If a read-write mount, convert it to a read-only mount. */
-                if (!(sb->s_flags & MS_RDONLY)) {
+                if (!sb_rdonly(sb)) {
                         if (!(vol->on_errors & (ON_ERRORS_REMOUNT_RO |
                                         ON_ERRORS_CONTINUE))) {
                                 ntfs_error(sb, "%s and neither on_errors="
@@ -1961,7 +1961,7 @@ get_ctx_vol_failed:
 
                 es1 = !vol->logfile_ino ? es1a : es1b;
                 /* If a read-write mount, convert it to a read-only mount. */
-                if (!(sb->s_flags & MS_RDONLY)) {
+                if (!sb_rdonly(sb)) {
                         if (!(vol->on_errors & (ON_ERRORS_REMOUNT_RO |
                                         ON_ERRORS_CONTINUE))) {
                                 ntfs_error(sb, "%s and neither on_errors="
@@ -2010,7 +2010,7 @@ get_ctx_vol_failed:
 
                 es1 = err < 0 ? es1a : es1b;
                 /* If a read-write mount, convert it to a read-only mount. */
-                if (!(sb->s_flags & MS_RDONLY)) {
+                if (!sb_rdonly(sb)) {
                         if (!(vol->on_errors & (ON_ERRORS_REMOUNT_RO |
                                         ON_ERRORS_CONTINUE))) {
                                 ntfs_error(sb, "%s and neither on_errors="
@@ -2028,8 +2028,7 @@ get_ctx_vol_failed:
                 NVolSetErrors(vol);
         }
         /* If (still) a read-write mount, mark the volume dirty. */
-        if (!(sb->s_flags & MS_RDONLY) &&
-                        ntfs_set_volume_flags(vol, VOLUME_IS_DIRTY)) {
+        if (!sb_rdonly(sb) && ntfs_set_volume_flags(vol, VOLUME_IS_DIRTY)) {
                 static const char *es1 = "Failed to set dirty bit in volume "
                                 "information flags";
                 static const char *es2 = ".  Run chkdsk.";
@@ -2075,8 +2074,7 @@ get_ctx_vol_failed:
         }
 #endif
         /* If (still) a read-write mount, empty the logfile. */
-        if (!(sb->s_flags & MS_RDONLY) &&
-                        !ntfs_empty_logfile(vol->logfile_ino)) {
+        if (!sb_rdonly(sb) && !ntfs_empty_logfile(vol->logfile_ino)) {
                 static const char *es1 = "Failed to empty $LogFile";
                 static const char *es2 = ".  Mount in Windows.";
 
@@ -2121,7 +2119,7 @@ get_ctx_vol_failed:
                 static const char *es2 = ".  Run chkdsk.";
 
                 /* If a read-write mount, convert it to a read-only mount. */
-                if (!(sb->s_flags & MS_RDONLY)) {
+                if (!sb_rdonly(sb)) {
                         if (!(vol->on_errors & (ON_ERRORS_REMOUNT_RO |
                                         ON_ERRORS_CONTINUE))) {
                                 ntfs_error(sb, "%s and neither on_errors="
@@ -2139,8 +2137,7 @@ get_ctx_vol_failed:
                 NVolSetErrors(vol);
         }
         /* If (still) a read-write mount, mark the quotas out of date. */
-        if (!(sb->s_flags & MS_RDONLY) &&
-                        !ntfs_mark_quotas_out_of_date(vol)) {
+        if (!sb_rdonly(sb) && !ntfs_mark_quotas_out_of_date(vol)) {
                 static const char *es1 = "Failed to mark quotas out of date";
                 static const char *es2 = ".  Run chkdsk.";
 
@@ -2165,7 +2162,7 @@ get_ctx_vol_failed:
                 static const char *es2 = ".  Run chkdsk.";
 
                 /* If a read-write mount, convert it to a read-only mount. */
-                if (!(sb->s_flags & MS_RDONLY)) {
+                if (!sb_rdonly(sb)) {
                         if (!(vol->on_errors & (ON_ERRORS_REMOUNT_RO |
                                         ON_ERRORS_CONTINUE))) {
                                 ntfs_error(sb, "%s and neither on_errors="
@@ -2183,7 +2180,7 @@ get_ctx_vol_failed:
                 NVolSetErrors(vol);
         }
         /* If (still) a read-write mount, stamp the transaction log. */
-        if (!(sb->s_flags & MS_RDONLY) && !ntfs_stamp_usnjrnl(vol)) {
+        if (!sb_rdonly(sb) && !ntfs_stamp_usnjrnl(vol)) {
                 static const char *es1 = "Failed to stamp transaction log "
                                 "($UsnJrnl)";
                 static const char *es2 = ".  Run chkdsk.";
@@ -2314,7 +2311,7 @@ static void ntfs_put_super(struct super_block *sb)
          * If a read-write mount and no volume errors have occurred, mark the
          * volume clean.  Also, re-commit all affected inodes.
          */
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 if (!NVolErrors(vol)) {
                         if (ntfs_clear_volume_flags(vol, VOLUME_IS_DIRTY))
                                 ntfs_warning(sb, "Failed to clear dirty bit "
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 3f936be379a9..80733496b22a 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -675,7 +675,7 @@ static int ocfs2_remount(struct super_block *sb, int *flags, char *data)
         }
 
         /* We're going to/from readonly mode. */
-        if ((*flags & MS_RDONLY) != (sb->s_flags & MS_RDONLY)) {
+        if ((bool)(*flags & MS_RDONLY) != sb_rdonly(sb)) {
                 /* Disable quota accounting before remounting RO */
                 if (*flags & MS_RDONLY) {
                         ret = ocfs2_susp_quotas(osb, 0);
@@ -1063,7 +1063,7 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
         /* Hard readonly mode only if: bdev_read_only, MS_RDONLY,
          * heartbeat=none */
         if (bdev_read_only(sb->s_bdev)) {
-                if (!(sb->s_flags & MS_RDONLY)) {
+                if (!sb_rdonly(sb)) {
                         status = -EACCES;
                         mlog(ML_ERROR, "Readonly device detected but readonly "
                              "mount was not specified.\n");
@@ -1098,7 +1098,7 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
         }
 
         if (!ocfs2_is_hard_readonly(osb)) {
-                if (sb->s_flags & MS_RDONLY)
+                if (sb_rdonly(sb))
                         ocfs2_set_ro_flag(osb, 0);
         }
 
@@ -1179,7 +1179,7 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
         /* Now we can initialize quotas because we can afford to wait
          * for cluster locks recovery now. That also means that truncation
          * log recovery can happen but that waits for proper quota setup */
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 status = ocfs2_enable_quotas(osb);
                 if (status < 0) {
                         /* We have to err-out specially here because
@@ -2180,8 +2180,7 @@ static int ocfs2_initialize_super(struct super_block *sb,
                 status = -EINVAL;
                 goto bail;
         }
-        if (!(osb->sb->s_flags & MS_RDONLY) &&
-            (i = OCFS2_HAS_RO_COMPAT_FEATURE(osb->sb, ~OCFS2_FEATURE_RO_COMPAT_SUPP))) {
+        if (!sb_rdonly(osb->sb) && (i = OCFS2_HAS_RO_COMPAT_FEATURE(osb->sb, ~OCFS2_FEATURE_RO_COMPAT_SUPP))) {
                 mlog(ML_ERROR, "couldn't mount RDWR because of "
                      "unsupported optional features (%x).\n", i);
                 status = -EINVAL;
@@ -2567,9 +2566,7 @@ static int ocfs2_handle_error(struct super_block *sb)
                 rv = -EIO;
         } else { /* default option */
                 rv = -EROFS;
-                if (sb->s_flags & MS_RDONLY &&
-                                (ocfs2_is_soft_readonly(osb) ||
-                                 ocfs2_is_hard_readonly(osb)))
+                if (sb_rdonly(sb) && (ocfs2_is_soft_readonly(osb) || ocfs2_is_hard_readonly(osb)))
                         return rv;
 
                 pr_crit("OCFS2: File system is now read-only.\n");
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index cd49c0298ddf..fd5ea4facc62 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -870,7 +870,7 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
                         goto out_free_config;
 
                 /* Upper fs should not be r/o */
-                if (upperpath.mnt->mnt_sb->s_flags & MS_RDONLY) {
+                if (sb_rdonly(upperpath.mnt->mnt_sb)) {
                         pr_err("overlayfs: upper fs is r/o, try multi-lower layers mount\n");
                         err = -EINVAL;
                         goto out_put_upperpath;
diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c
index b5713fefb4c1..99dff222fe67 100644
--- a/fs/proc_namespace.c
+++ b/fs/proc_namespace.c
@@ -178,7 +178,7 @@ static int show_mountinfo(struct seq_file *m, struct vfsmount *mnt)
         } else {
                 mangle(m, r->mnt_devname ? r->mnt_devname : "none");
         }
-        seq_puts(m, sb->s_flags & MS_RDONLY ? " ro" : " rw");
+        seq_puts(m, sb_rdonly(sb) ? " ro" : " rw");
         err = show_sb_opts(m, sb);
         if (err)
                 goto out;
diff --git a/fs/quota/quota.c b/fs/quota/quota.c
index 07e08c7d05ca..a9c5dfe6b83e 100644
--- a/fs/quota/quota.c
+++ b/fs/quota/quota.c
@@ -753,7 +753,7 @@ static int do_quotactl(struct super_block *sb, int type, int cmd, qid_t id,
         case Q_XGETNEXTQUOTA:
                 return quota_getnextxquota(sb, type, id, addr);
         case Q_XQUOTASYNC:
-                if (sb->s_flags & MS_RDONLY)
+                if (sb_rdonly(sb))
                         return -EROFS;
                 /* XFS quotas are fully coherent now, making this call a noop */
                 return 0;
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 873fc04e9403..11a48affa882 100644
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -1776,7 +1776,7 @@ int reiserfs_write_inode(struct inode *inode, struct writeback_control *wbc)
         struct reiserfs_transaction_handle th;
         int jbegin_count = 1;
 
-        if (inode->i_sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(inode->i_sb))
                 return -EROFS;
         /*
          * memory pressure can sometimes initiate write_inode calls with
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index 0c882a0e2a6e..f59c667df15b 100644
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -1918,7 +1918,7 @@ static int do_journal_release(struct reiserfs_transaction_handle *th,
          * we only want to flush out transactions if we were
          * called with error == 0
          */
-        if (!error && !(sb->s_flags & MS_RDONLY)) {
+        if (!error && !sb_rdonly(sb)) {
                 /* end the current trans */
                 BUG_ON(!th->t_trans_id);
                 do_journal_end(th, FLUSH_ALL);
diff --git a/fs/reiserfs/prints.c b/fs/reiserfs/prints.c
index 4f3f928076f3..64f49cafbc5b 100644
--- a/fs/reiserfs/prints.c
+++ b/fs/reiserfs/prints.c
@@ -386,7 +386,7 @@ void __reiserfs_error(struct super_block *sb, const char *id,
                 printk(KERN_CRIT "REISERFS error (device %s): %s: %s\n",
                        sb->s_id, function, error_buf);
 
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 return;
 
         reiserfs_info(sb, "Remounting filesystem read-only\n");
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 306e4e9d172d..5464ec517702 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -121,7 +121,7 @@ void reiserfs_schedule_old_flush(struct super_block *s)
          * Avoid scheduling flush when sb is being shut down. It can race
          * with journal shutdown and free still queued delayed work.
          */
-        if (s->s_flags & MS_RDONLY || !(s->s_flags & MS_ACTIVE))
+        if (sb_rdonly(s) || !(s->s_flags & MS_ACTIVE))
                 return;
 
         spin_lock(&sbi->old_work_lock);
@@ -151,7 +151,7 @@ static int reiserfs_freeze(struct super_block *s)
         reiserfs_cancel_old_flush(s);
 
         reiserfs_write_lock(s);
-        if (!(s->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(s)) {
                 int err = journal_begin(&th, s, 1);
                 if (err) {
                         reiserfs_block_writes(&th);
@@ -599,7 +599,7 @@ static void reiserfs_put_super(struct super_block *s)
          * change file system state to current state if it was mounted
          * with read-write permissions
          */
-        if (!(s->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(s)) {
                 if (!journal_begin(&th, s, 10)) {
                         reiserfs_prepare_for_journal(s, SB_BUFFER_WITH_SB(s),
                                                      1);
@@ -700,7 +700,7 @@ static void reiserfs_dirty_inode(struct inode *inode, int flags)
 
         int err = 0;
 
-        if (inode->i_sb->s_flags & MS_RDONLY) {
+        if (sb_rdonly(inode->i_sb)) {
                 reiserfs_warning(inode->i_sb, "clm-6006",
                                  "writing inode %lu on readonly FS",
                                  inode->i_ino);
@@ -1525,7 +1525,7 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg)
                 reiserfs_write_unlock(s);
                 reiserfs_xattr_init(s, *mount_flags);
                 /* remount read-only */
-                if (s->s_flags & MS_RDONLY)
+                if (sb_rdonly(s))
                         /* it is read-only already */
                         goto out_ok_unlocked;
 
@@ -1551,7 +1551,7 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg)
                 journal_mark_dirty(&th, SB_BUFFER_WITH_SB(s));
         } else {
                 /* remount read-write */
-                if (!(s->s_flags & MS_RDONLY)) {
+                if (!sb_rdonly(s)) {
                         reiserfs_write_unlock(s);
                         reiserfs_xattr_init(s, *mount_flags);
                         goto out_ok_unlocked;   /* We are read-write already */
@@ -1855,7 +1855,7 @@ static int what_hash(struct super_block *s)
          * the super
          */
         if (code != UNSET_HASH &&
-            !(s->s_flags & MS_RDONLY) &&
+            !sb_rdonly(s) &&
             code != sb_hash_function_code(SB_DISK_SUPER_BLOCK(s))) {
                 set_sb_hash_function_code(SB_DISK_SUPER_BLOCK(s), code);
         }
@@ -2052,7 +2052,7 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
         if (replay_only(s))
                 goto error_unlocked;
 
-        if (bdev_read_only(s->s_bdev) && !(s->s_flags & MS_RDONLY)) {
+        if (bdev_read_only(s->s_bdev) && !sb_rdonly(s)) {
                 SWARN(silent, s, "clm-7000",
                       "Detected readonly device, marking FS readonly");
                 s->s_flags |= MS_RDONLY;
@@ -2101,7 +2101,7 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
         else
                 set_bit(REISERFS_3_6, &sbi->s_properties);
 
-        if (!(s->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(s)) {
 
                 errval = journal_begin(&th, s, 1);
                 if (errval) {
diff --git a/fs/super.c b/fs/super.c
index 221cfa1f4e92..166c4ee0d0ed 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -360,7 +360,7 @@ static int grab_super(struct super_block *s) __releases(sb_lock)
         s->s_count++;
         spin_unlock(&sb_lock);
         down_write(&s->s_umount);
-        if ((s->s_flags & MS_BORN) && atomic_inc_not_zero(&s->s_active)) {
+        if ((s->s_flags & SB_BORN) && atomic_inc_not_zero(&s->s_active)) {
                 put_super(s);
                 return 1;
         }
@@ -390,7 +390,7 @@ bool trylock_super(struct super_block *sb)
 {
         if (down_read_trylock(&sb->s_umount)) {
                 if (!hlist_unhashed(&sb->s_instances) &&
-                    sb->s_root && (sb->s_flags & MS_BORN))
+                    sb->s_root && (sb->s_flags & SB_BORN))
                         return true;
                 up_read(&sb->s_umount);
         }
@@ -419,7 +419,7 @@ void generic_shutdown_super(struct super_block *sb)
         if (sb->s_root) {
                 shrink_dcache_for_umount(sb);
                 sync_filesystem(sb);
-                sb->s_flags &= ~MS_ACTIVE;
+                sb->s_flags &= ~SB_ACTIVE;
 
                 fsnotify_unmount_inodes(sb);
                 cgroup_writeback_umount();
@@ -472,7 +472,7 @@ struct super_block *sget_userns(struct file_system_type *type,
         struct super_block *old;
         int err;
 
-        if (!(flags & (MS_KERNMOUNT|MS_SUBMOUNT)) &&
+        if (!(flags & (SB_KERNMOUNT|SB_SUBMOUNT)) &&
             !(type->fs_flags & FS_USERNS_MOUNT) &&
             !capable(CAP_SYS_ADMIN))
                 return ERR_PTR(-EPERM);
@@ -502,7 +502,7 @@ retry:
         }
         if (!s) {
                 spin_unlock(&sb_lock);
-                s = alloc_super(type, (flags & ~MS_SUBMOUNT), user_ns);
+                s = alloc_super(type, (flags & ~SB_SUBMOUNT), user_ns);
                 if (!s)
                         return ERR_PTR(-ENOMEM);
                 goto retry;
@@ -547,11 +547,11 @@ struct super_block *sget(struct file_system_type *type,
          * mount through to here so always use &init_user_ns
          * until that changes.
          */
-        if (flags & MS_SUBMOUNT)
+        if (flags & SB_SUBMOUNT)
                 user_ns = &init_user_ns;
 
         /* Ensure the requestor has permissions over the target filesystem */
-        if (!(flags & (MS_KERNMOUNT|MS_SUBMOUNT)) && !ns_capable(user_ns, CAP_SYS_ADMIN))
+        if (!(flags & (SB_KERNMOUNT|SB_SUBMOUNT)) && !ns_capable(user_ns, CAP_SYS_ADMIN))
                 return ERR_PTR(-EPERM);
 
         return sget_userns(type, test, set, flags, user_ns, data);
@@ -594,7 +594,7 @@ void iterate_supers(void (*f)(struct super_block *, void *), void *arg)
                 spin_unlock(&sb_lock);
 
                 down_read(&sb->s_umount);
-                if (sb->s_root && (sb->s_flags & MS_BORN))
+                if (sb->s_root && (sb->s_flags & SB_BORN))
                         f(sb, arg);
                 up_read(&sb->s_umount);
 
@@ -628,7 +628,7 @@ void iterate_supers_type(struct file_system_type *type,
                 spin_unlock(&sb_lock);
 
                 down_read(&sb->s_umount);
-                if (sb->s_root && (sb->s_flags & MS_BORN))
+                if (sb->s_root && (sb->s_flags & SB_BORN))
                         f(sb, arg);
                 up_read(&sb->s_umount);
 
@@ -664,7 +664,7 @@ rescan:
                         else
                                 down_write(&sb->s_umount);
                         /* still alive? */
-                        if (sb->s_root && (sb->s_flags & MS_BORN))
+                        if (sb->s_root && (sb->s_flags & SB_BORN))
                                 return sb;
                         if (!excl)
                                 up_read(&sb->s_umount);
@@ -785,7 +785,7 @@ rescan:
                         spin_unlock(&sb_lock);
                         down_read(&sb->s_umount);
                         /* still alive? */
-                        if (sb->s_root && (sb->s_flags & MS_BORN))
+                        if (sb->s_root && (sb->s_flags & SB_BORN))
                                 return sb;
                         up_read(&sb->s_umount);
                         /* nope, got unmounted */
@@ -801,13 +801,13 @@ rescan:
 /**
  *      do_remount_sb - asks filesystem to change mount options.
  *      @sb:    superblock in question
- *      @flags: numeric part of options
+ *      @sb_flags: revised superblock flags
  *      @data:  the rest of options
  *      @force: whether or not to force the change
  *
  *      Alters the mount options of a mounted file system.
  */
-int do_remount_sb(struct super_block *sb, int flags, void *data, int force)
+int do_remount_sb(struct super_block *sb, int sb_flags, void *data, int force)
 {
         int retval;
         int remount_ro;
@@ -816,11 +816,11 @@ int do_remount_sb(struct super_block *sb, int flags, void *data, int force)
                 return -EBUSY;
 
 #ifdef CONFIG_BLOCK
-        if (!(flags & MS_RDONLY) && bdev_read_only(sb->s_bdev))
+        if (!(sb_flags & SB_RDONLY) && bdev_read_only(sb->s_bdev))
                 return -EACCES;
 #endif
 
-        remount_ro = (flags & MS_RDONLY) && !(sb->s_flags & MS_RDONLY);
+        remount_ro = (sb_flags & SB_RDONLY) && !sb_rdonly(sb);
 
         if (remount_ro) {
                 if (!hlist_empty(&sb->s_pins)) {
@@ -831,7 +831,7 @@ int do_remount_sb(struct super_block *sb, int flags, void *data, int force)
                                 return 0;
                         if (sb->s_writers.frozen != SB_UNFROZEN)
                                 return -EBUSY;
-                        remount_ro = (flags & MS_RDONLY) && !(sb->s_flags & MS_RDONLY);
+                        remount_ro = (sb_flags & SB_RDONLY) && !sb_rdonly(sb);
                 }
         }
         shrink_dcache_sb(sb);
@@ -850,7 +850,7 @@ int do_remount_sb(struct super_block *sb, int flags, void *data, int force)
         }
 
         if (sb->s_op->remount_fs) {
-                retval = sb->s_op->remount_fs(sb, &flags, data);
+                retval = sb->s_op->remount_fs(sb, &sb_flags, data);
                 if (retval) {
                         if (!force)
                                 goto cancel_readonly;
@@ -859,7 +859,7 @@ int do_remount_sb(struct super_block *sb, int flags, void *data, int force)
                              sb->s_type->name, retval);
                 }
         }
-        sb->s_flags = (sb->s_flags & ~MS_RMT_MASK) | (flags & MS_RMT_MASK);
+        sb->s_flags = (sb->s_flags & ~MS_RMT_MASK) | (sb_flags & MS_RMT_MASK);
         /* Needs to be ordered wrt mnt_is_readonly() */
         smp_wmb();
         sb->s_readonly_remount = 0;
@@ -892,12 +892,12 @@ static void do_emergency_remount(struct work_struct *work)
                 sb->s_count++;
                 spin_unlock(&sb_lock);
                 down_write(&sb->s_umount);
-                if (sb->s_root && sb->s_bdev && (sb->s_flags & MS_BORN) &&
-                    !(sb->s_flags & MS_RDONLY)) {
+                if (sb->s_root && sb->s_bdev && (sb->s_flags & SB_BORN) &&
+                    !sb_rdonly(sb)) {
                         /*
                          * What lock protects sb->s_flags??
                          */
-                        do_remount_sb(sb, MS_RDONLY, NULL, 1);
+                        do_remount_sb(sb, SB_RDONLY, NULL, 1);
                 }
                 up_write(&sb->s_umount);
                 spin_lock(&sb_lock);
@@ -1023,7 +1023,7 @@ struct dentry *mount_ns(struct file_system_type *fs_type,
         /* Don't allow mounting unless the caller has CAP_SYS_ADMIN
          * over the namespace.
          */
-        if (!(flags & MS_KERNMOUNT) && !ns_capable(user_ns, CAP_SYS_ADMIN))
+        if (!(flags & SB_KERNMOUNT) && !ns_capable(user_ns, CAP_SYS_ADMIN))
                 return ERR_PTR(-EPERM);
 
         sb = sget_userns(fs_type, ns_test_super, ns_set_super, flags,
@@ -1033,13 +1033,13 @@ struct dentry *mount_ns(struct file_system_type *fs_type,
 
         if (!sb->s_root) {
                 int err;
-                err = fill_super(sb, data, flags & MS_SILENT ? 1 : 0);
+                err = fill_super(sb, data, flags & SB_SILENT ? 1 : 0);
                 if (err) {
                         deactivate_locked_super(sb);
                         return ERR_PTR(err);
                 }
 
-                sb->s_flags |= MS_ACTIVE;
+                sb->s_flags |= SB_ACTIVE;
         }
 
         return dget(sb->s_root);
@@ -1071,7 +1071,7 @@ struct dentry *mount_bdev(struct file_system_type *fs_type,
         fmode_t mode = FMODE_READ | FMODE_EXCL;
         int error = 0;
 
-        if (!(flags & MS_RDONLY))
+        if (!(flags & SB_RDONLY))
                 mode |= FMODE_WRITE;
 
         bdev = blkdev_get_by_path(dev_name, mode, fs_type);
@@ -1089,14 +1089,14 @@ struct dentry *mount_bdev(struct file_system_type *fs_type,
                 error = -EBUSY;
                 goto error_bdev;
         }
-        s = sget(fs_type, test_bdev_super, set_bdev_super, flags | MS_NOSEC,
+        s = sget(fs_type, test_bdev_super, set_bdev_super, flags | SB_NOSEC,
                  bdev);
         mutex_unlock(&bdev->bd_fsfreeze_mutex);
         if (IS_ERR(s))
                 goto error_s;
 
         if (s->s_root) {
-                if ((flags ^ s->s_flags) & MS_RDONLY) {
+                if ((flags ^ s->s_flags) & SB_RDONLY) {
                         deactivate_locked_super(s);
                         error = -EBUSY;
                         goto error_bdev;
@@ -1116,13 +1116,13 @@ struct dentry *mount_bdev(struct file_system_type *fs_type,
                 s->s_mode = mode;
                 snprintf(s->s_id, sizeof(s->s_id), "%pg", bdev);
                 sb_set_blocksize(s, block_size(bdev));
-                error = fill_super(s, data, flags & MS_SILENT ? 1 : 0);
+                error = fill_super(s, data, flags & SB_SILENT ? 1 : 0);
                 if (error) {
                         deactivate_locked_super(s);
                         goto error;
                 }
 
-                s->s_flags |= MS_ACTIVE;
+                s->s_flags |= SB_ACTIVE;
                 bdev->bd_super = s;
         }
 
@@ -1162,12 +1162,12 @@ struct dentry *mount_nodev(struct file_system_type *fs_type,
         if (IS_ERR(s))
                 return ERR_CAST(s);
 
-        error = fill_super(s, data, flags & MS_SILENT ? 1 : 0);
+        error = fill_super(s, data, flags & SB_SILENT ? 1 : 0);
         if (error) {
                 deactivate_locked_super(s);
                 return ERR_PTR(error);
         }
-        s->s_flags |= MS_ACTIVE;
+        s->s_flags |= SB_ACTIVE;
         return dget(s->s_root);
 }
 EXPORT_SYMBOL(mount_nodev);
@@ -1188,12 +1188,12 @@ struct dentry *mount_single(struct file_system_type *fs_type,
         if (IS_ERR(s))
                 return ERR_CAST(s);
         if (!s->s_root) {
-                error = fill_super(s, data, flags & MS_SILENT ? 1 : 0);
+                error = fill_super(s, data, flags & SB_SILENT ? 1 : 0);
                 if (error) {
                         deactivate_locked_super(s);
                         return ERR_PTR(error);
                 }
-                s->s_flags |= MS_ACTIVE;
+                s->s_flags |= SB_ACTIVE;
         } else {
                 do_remount_sb(s, flags, data, 0);
         }
@@ -1227,7 +1227,7 @@ mount_fs(struct file_system_type *type, int flags, const char *name, void *data)
         sb = root->d_sb;
         BUG_ON(!sb);
         WARN_ON(!sb->s_bdi);
-        sb->s_flags |= MS_BORN;
+        sb->s_flags |= SB_BORN;
 
         error = security_sb_kern_mount(sb, flags, secdata);
         if (error)
@@ -1434,12 +1434,12 @@ int freeze_super(struct super_block *sb)
                 return -EBUSY;
         }
 
-        if (!(sb->s_flags & MS_BORN)) {
+        if (!(sb->s_flags & SB_BORN)) {
                 up_write(&sb->s_umount);
                 return 0;       /* sic - it's "nothing to do" */
         }
 
-        if (sb->s_flags & MS_RDONLY) {
+        if (sb_rdonly(sb)) {
                 /* Nothing to do really... */
                 sb->s_writers.frozen = SB_FREEZE_COMPLETE;
                 up_write(&sb->s_umount);
@@ -1502,7 +1502,7 @@ int thaw_super(struct super_block *sb)
                 return -EINVAL;
         }
 
-        if (sb->s_flags & MS_RDONLY) {
+        if (sb_rdonly(sb)) {
                 sb->s_writers.frozen = SB_UNFROZEN;
                 goto out;
         }
diff --git a/fs/sync.c b/fs/sync.c
index 2e3fd7d94d2d..a576aa2e6b09 100644
--- a/fs/sync.c
+++ b/fs/sync.c
@@ -57,7 +57,7 @@ int sync_filesystem(struct super_block *sb)
         /*
          * No point in syncing out anything if the filesystem is read-only.
          */
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 return 0;
 
         ret = __sync_filesystem(sb, 0);
@@ -69,13 +69,13 @@ EXPORT_SYMBOL(sync_filesystem);
 
 static void sync_inodes_one_sb(struct super_block *sb, void *arg)
 {
-        if (!(sb->s_flags & MS_RDONLY))
+        if (!sb_rdonly(sb))
                 sync_inodes_sb(sb);
 }
 
 static void sync_fs_one_sb(struct super_block *sb, void *arg)
 {
-        if (!(sb->s_flags & MS_RDONLY) && sb->s_op->sync_fs)
+        if (!sb_rdonly(sb) && sb->s_op->sync_fs)
                 sb->s_op->sync_fs(sb, *(int *)arg);
 }
 
diff --git a/fs/sysv/balloc.c b/fs/sysv/balloc.c
index 921c053fc052..862c1f74a583 100644
--- a/fs/sysv/balloc.c
+++ b/fs/sysv/balloc.c
@@ -231,7 +231,7 @@ trust_sb:
 Ecount:
         printk("sysv_count_free_blocks: free block count was %d, "
                 "correcting to %d\n", sb_count, count);
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 *sbi->s_free_blocks = cpu_to_fs32(sbi, count);
                 dirty_sb(sb);
         }
diff --git a/fs/sysv/ialloc.c b/fs/sysv/ialloc.c
index 53f1b78996dd..eb963fbb7903 100644
--- a/fs/sysv/ialloc.c
+++ b/fs/sysv/ialloc.c
@@ -220,7 +220,7 @@ Einval:
         printk("sysv_count_free_inodes: "
                 "free inode count was %d, correcting to %d\n",
                 sb_count, count);
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 *sbi->s_sb_total_free_inodes = cpu_to_fs16(SYSV_SB(sb), count);
                 dirty_sb(sb);
         }
diff --git a/fs/sysv/inode.c b/fs/sysv/inode.c
index 858fb72f9e0f..1c8bf9453a71 100644
--- a/fs/sysv/inode.c
+++ b/fs/sysv/inode.c
@@ -70,7 +70,7 @@ static void sysv_put_super(struct super_block *sb)
 {
         struct sysv_sb_info *sbi = SYSV_SB(sb);
 
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 /* XXX ext2 also updates the state here */
                 mark_buffer_dirty(sbi->s_bh1);
                 if (sbi->s_bh1 != sbi->s_bh2)
diff --git a/fs/sysv/super.c b/fs/sysv/super.c
index eda10959714f..0d56e486b392 100644
--- a/fs/sysv/super.c
+++ b/fs/sysv/super.c
@@ -216,7 +216,7 @@ static int detect_sysv(struct sysv_sb_info *sbi, struct buffer_head *bh)
         if (fs16_to_cpu(sbi, sbd->s_nfree) == 0xffff) {
                 sbi->s_type = FSTYPE_AFS;
                 sbi->s_forced_ro = 1;
-                if (!(sb->s_flags & MS_RDONLY)) {
+                if (!sb_rdonly(sb)) {
                         printk("SysV FS: SCO EAFS on %s detected, " 
                                 "forcing read-only mode.\n", 
                                 sb->s_id);
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index bffadbb67e47..5496b17b959c 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -1159,7 +1159,7 @@ static int mount_ubifs(struct ubifs_info *c)
         long long x, y;
         size_t sz;
 
-        c->ro_mount = !!(c->vfs_sb->s_flags & MS_RDONLY);
+        c->ro_mount = !!sb_rdonly(c->vfs_sb);
         /* Suppress error messages while probing if MS_SILENT is set */
         c->probing = !!(c->vfs_sb->s_flags & MS_SILENT);
 
diff --git a/fs/udf/super.c b/fs/udf/super.c
index 93c59630512b..99cb81d0077f 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -673,7 +673,7 @@ static int udf_remount_fs(struct super_block *sb, int *flags, char *options)
         sbi->s_dmode = uopt.dmode;
         write_unlock(&sbi->s_cred_lock);
 
-        if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
+        if ((bool)(*flags & MS_RDONLY) == sb_rdonly(sb))
                 goto out_unlock;
 
         if (*flags & MS_RDONLY)
@@ -1017,7 +1017,7 @@ static int udf_load_metadata_files(struct super_block *sb, int partition,
 
                 fe = udf_iget_special(sb, &addr);
                 if (IS_ERR(fe)) {
-                        if (sb->s_flags & MS_RDONLY)
+                        if (sb_rdonly(sb))
                                 udf_warn(sb, "bitmap inode efe not found but it's ok since the disc is mounted read-only\n");
                         else {
                                 udf_err(sb, "bitmap inode efe not found and attempted read-write mount\n");
@@ -1341,7 +1341,7 @@ static int udf_load_partdesc(struct super_block *sb, sector_t block)
                  * writing to it (we overwrite blocks instead of relocating
                  * them).
                  */
-                if (!(sb->s_flags & MS_RDONLY)) {
+                if (!sb_rdonly(sb)) {
                         ret = -EACCES;
                         goto out_bh;
                 }
@@ -2205,7 +2205,7 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent)
                         ret = -EINVAL;
                         goto error_out;
                 } else if (minUDFWriteRev > UDF_MAX_WRITE_VERSION &&
-                           !(sb->s_flags & MS_RDONLY)) {
+                           !sb_rdonly(sb)) {
                         ret = -EACCES;
                         goto error_out;
                 }
@@ -2226,7 +2226,7 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent)
 
         if (sbi->s_partmaps[sbi->s_partition].s_partition_flags &
                         UDF_PART_FLAG_READ_ONLY &&
-            !(sb->s_flags & MS_RDONLY)) {
+            !sb_rdonly(sb)) {
                 ret = -EACCES;
                 goto error_out;
         }
@@ -2245,7 +2245,7 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent)
                          le16_to_cpu(ts.year), ts.month, ts.day,
                          ts.hour, ts.minute, le16_to_cpu(ts.typeAndTimezone));
         }
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 udf_open_lvid(sb);
                 lvid_open = true;
         }
@@ -2332,7 +2332,7 @@ static void udf_put_super(struct super_block *sb)
         if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP))
                 unload_nls(sbi->s_nls_map);
 #endif
-        if (!(sb->s_flags & MS_RDONLY))
+        if (!sb_rdonly(sb))
                 udf_close_lvid(sb);
         brelse(sbi->s_lvid_bh);
         udf_sb_free_partitions(sb);
diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index 0a4f58a5073c..6440003f8ddc 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -278,7 +278,7 @@ void ufs_error (struct super_block * sb, const char * function,
         uspi = UFS_SB(sb)->s_uspi;
         usb1 = ubh_get_usb_first(uspi);
         
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 usb1->fs_clean = UFS_FSBAD;
                 ubh_mark_buffer_dirty(USPI_UBH(uspi));
                 ufs_mark_sb_dirty(sb);
@@ -312,7 +312,7 @@ void ufs_panic (struct super_block * sb, const char * function,
         uspi = UFS_SB(sb)->s_uspi;
         usb1 = ubh_get_usb_first(uspi);
         
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 usb1->fs_clean = UFS_FSBAD;
                 ubh_mark_buffer_dirty(USPI_UBH(uspi));
                 ufs_mark_sb_dirty(sb);
@@ -742,7 +742,7 @@ static void ufs_put_super(struct super_block *sb)
 
         UFSD("ENTER\n");
 
-        if (!(sb->s_flags & MS_RDONLY))
+        if (!sb_rdonly(sb))
                 ufs_put_super_internal(sb);
         cancel_delayed_work_sync(&sbi->sync_work);
 
@@ -793,7 +793,7 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)
         UFSD("ENTER\n");
 
 #ifndef CONFIG_UFS_FS_WRITE
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 pr_err("ufs was compiled with read-only support, can't be mounted as read-write\n");
                 return -EROFS;
         }
@@ -805,7 +805,7 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)
         sb->s_fs_info = sbi;
         sbi->sb = sb;
 
-        UFSD("flag %u\n", (int)(sb->s_flags & MS_RDONLY));
+        UFSD("flag %u\n", (int)(sb_rdonly(sb)));
         
         mutex_init(&sbi->s_lock);
         spin_lock_init(&sbi->work_lock);
@@ -902,7 +902,7 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)
                 uspi->s_sbsize = super_block_size = 2048;
                 uspi->s_sbbase = 0;
                 flags |= UFS_DE_OLD | UFS_UID_OLD | UFS_ST_OLD | UFS_CG_OLD;
-                if (!(sb->s_flags & MS_RDONLY)) {
+                if (!sb_rdonly(sb)) {
                         if (!silent)
                                 pr_info("ufstype=old is supported read-only\n");
                         sb->s_flags |= MS_RDONLY;
@@ -918,7 +918,7 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)
                 uspi->s_sbbase = 0;
                 uspi->s_dirblksize = 1024;
                 flags |= UFS_DE_OLD | UFS_UID_OLD | UFS_ST_OLD | UFS_CG_OLD;
-                if (!(sb->s_flags & MS_RDONLY)) {
+                if (!sb_rdonly(sb)) {
                         if (!silent)
                                 pr_info("ufstype=nextstep is supported read-only\n");
                         sb->s_flags |= MS_RDONLY;
@@ -934,7 +934,7 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)
                 uspi->s_sbbase = 0;
                 uspi->s_dirblksize = 1024;
                 flags |= UFS_DE_OLD | UFS_UID_OLD | UFS_ST_OLD | UFS_CG_OLD;
-                if (!(sb->s_flags & MS_RDONLY)) {
+                if (!sb_rdonly(sb)) {
                         if (!silent)
                                 pr_info("ufstype=nextstep-cd is supported read-only\n");
                         sb->s_flags |= MS_RDONLY;
@@ -950,7 +950,7 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)
                 uspi->s_sbbase = 0;
                 uspi->s_dirblksize = 1024;
                 flags |= UFS_DE_44BSD | UFS_UID_44BSD | UFS_ST_44BSD | UFS_CG_44BSD;
-                if (!(sb->s_flags & MS_RDONLY)) {
+                if (!sb_rdonly(sb)) {
                         if (!silent)
                                 pr_info("ufstype=openstep is supported read-only\n");
                         sb->s_flags |= MS_RDONLY;
@@ -965,7 +965,7 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)
                 uspi->s_sbsize = super_block_size = 2048;
                 uspi->s_sbbase = 0;
                 flags |= UFS_DE_OLD | UFS_UID_OLD | UFS_ST_OLD | UFS_CG_OLD;
-                if (!(sb->s_flags & MS_RDONLY)) {
+                if (!sb_rdonly(sb)) {
                         if (!silent)
                                 pr_info("ufstype=hp is supported read-only\n");
                         sb->s_flags |= MS_RDONLY;
@@ -1273,7 +1273,7 @@ magic_found:
         /*
          * Read cylinder group structures
          */
-        if (!(sb->s_flags & MS_RDONLY))
+        if (!sb_rdonly(sb))
                 if (!ufs_read_cylinder_structures(sb))
                         goto failed;
 
@@ -1328,7 +1328,7 @@ static int ufs_remount (struct super_block *sb, int *mount_flags, char *data)
                 return -EINVAL;
         }
 
-        if ((*mount_flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) {
+        if ((bool)(*mount_flags & MS_RDONLY) == sb_rdonly(sb)) {
                 UFS_SB(sb)->s_mount_opt = new_mount_opt;
                 mutex_unlock(&UFS_SB(sb)->s_lock);
                 return 0;
diff --git a/fs/xfs/xfs_quotaops.c b/fs/xfs/xfs_quotaops.c
index de9493253edf..a65108594a07 100644
--- a/fs/xfs/xfs_quotaops.c
+++ b/fs/xfs/xfs_quotaops.c
@@ -125,7 +125,7 @@ xfs_fs_set_info(
         struct xfs_mount *mp = XFS_M(sb);
         struct qc_dqblk newlim;
 
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 return -EROFS;
         if (!XFS_IS_QUOTA_RUNNING(mp))
                 return -ENOSYS;
@@ -175,7 +175,7 @@ xfs_quota_enable(
 {
         struct xfs_mount        *mp = XFS_M(sb);
 
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 return -EROFS;
         if (!XFS_IS_QUOTA_RUNNING(mp))
                 return -ENOSYS;
@@ -190,7 +190,7 @@ xfs_quota_disable(
 {
         struct xfs_mount        *mp = XFS_M(sb);
 
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 return -EROFS;
         if (!XFS_IS_QUOTA_RUNNING(mp))
                 return -ENOSYS;
@@ -208,7 +208,7 @@ xfs_fs_rm_xquota(
         struct xfs_mount        *mp = XFS_M(sb);
         unsigned int            flags = 0;
 
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 return -EROFS;
 
         if (XFS_IS_QUOTA_ON(mp))
@@ -279,7 +279,7 @@ xfs_fs_set_dqblk(
 {
         struct xfs_mount        *mp = XFS_M(sb);
 
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 return -EROFS;
         if (!XFS_IS_QUOTA_RUNNING(mp))
                 return -ENOSYS;
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 3008f31753df..c996f4ae4a5f 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -210,7 +210,7 @@ xfs_parseargs(
         /*
          * Copy binary VFS mount flags we are interested in.
          */
-        if (sb->s_flags & MS_RDONLY)
+        if (sb_rdonly(sb))
                 mp->m_flags |= XFS_MOUNT_RDONLY;
         if (sb->s_flags & MS_DIRSYNC)
                 mp->m_flags |= XFS_MOUNT_DIRSYNC;
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 6e187cba94c3..b4ae080f41a6 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1271,6 +1271,33 @@ extern pid_t f_getown(struct file *filp);
 extern int send_sigurg(struct fown_struct *fown);
 
 /*
+ * sb->s_flags.  Note that these mirror the equivalent MS_* flags where
+ * represented in both.
+ */
+#define SB_RDONLY        1      /* Mount read-only */
+#define SB_NOSUID        2      /* Ignore suid and sgid bits */
+#define SB_NODEV         4      /* Disallow access to device special files */
+#define SB_NOEXEC        8      /* Disallow program execution */
+#define SB_SYNCHRONOUS  16      /* Writes are synced at once */
+#define SB_MANDLOCK     64      /* Allow mandatory locks on an FS */
+#define SB_DIRSYNC      128     /* Directory modifications are synchronous */
+#define SB_NOATIME      1024    /* Do not update access times. */
+#define SB_NODIRATIME   2048    /* Do not update directory access times */
+#define SB_SILENT       32768
+#define SB_POSIXACL     (1<<16) /* VFS does not apply the umask */
+#define SB_KERNMOUNT    (1<<22) /* this is a kern_mount call */
+#define SB_I_VERSION    (1<<23) /* Update inode I_version field */
+#define SB_LAZYTIME     (1<<25) /* Update the on-disk [acm]times lazily */
+
+/* These sb flags are internal to the kernel */
+#define SB_SUBMOUNT     (1<<26)
+#define SB_NOREMOTELOCK (1<<27)
+#define SB_NOSEC        (1<<28)
+#define SB_BORN         (1<<29)
+#define SB_ACTIVE       (1<<30)
+#define SB_NOUSER       (1<<31)
+
+/*
  *      Umount options
  */
 
@@ -1833,7 +1860,7 @@ struct super_operations {
  * possible to override it selectively if you really wanted to with some
  * ioctl() that is not currently implemented.
  *
- * Exception: MS_RDONLY is always applied to the entire file system.
+ * Exception: SB_RDONLY is always applied to the entire file system.
  *
  * Unfortunately, it is possible to change a filesystems flags with it mounted
  * with files in use.  This means that all of the inodes will not have their
@@ -1842,19 +1869,20 @@ struct super_operations {
  */
 #define __IS_FLG(inode, flg)    ((inode)->i_sb->s_flags & (flg))
 
-#define IS_RDONLY(inode)        ((inode)->i_sb->s_flags & MS_RDONLY)
-#define IS_SYNC(inode)          (__IS_FLG(inode, MS_SYNCHRONOUS) || \
+static inline bool sb_rdonly(const struct super_block *sb) { return sb->s_flags & MS_RDONLY; }
+#define IS_RDONLY(inode)        sb_rdonly((inode)->i_sb)
+#define IS_SYNC(inode)          (__IS_FLG(inode, SB_SYNCHRONOUS) || \
                                         ((inode)->i_flags & S_SYNC))
-#define IS_DIRSYNC(inode)       (__IS_FLG(inode, MS_SYNCHRONOUS|MS_DIRSYNC) || \
+#define IS_DIRSYNC(inode)       (__IS_FLG(inode, SB_SYNCHRONOUS|SB_DIRSYNC) || \
                                         ((inode)->i_flags & (S_SYNC|S_DIRSYNC)))
-#define IS_MANDLOCK(inode)      __IS_FLG(inode, MS_MANDLOCK)
-#define IS_NOATIME(inode)       __IS_FLG(inode, MS_RDONLY|MS_NOATIME)
-#define IS_I_VERSION(inode)     __IS_FLG(inode, MS_I_VERSION)
+#define IS_MANDLOCK(inode)      __IS_FLG(inode, SB_MANDLOCK)
+#define IS_NOATIME(inode)       __IS_FLG(inode, SB_RDONLY|SB_NOATIME)
+#define IS_I_VERSION(inode)     __IS_FLG(inode, SB_I_VERSION)
 
 #define IS_NOQUOTA(inode)       ((inode)->i_flags & S_NOQUOTA)
 #define IS_APPEND(inode)        ((inode)->i_flags & S_APPEND)
 #define IS_IMMUTABLE(inode)     ((inode)->i_flags & S_IMMUTABLE)
-#define IS_POSIXACL(inode)      __IS_FLG(inode, MS_POSIXACL)
+#define IS_POSIXACL(inode)      __IS_FLG(inode, SB_POSIXACL)
 
 #define IS_DEADDIR(inode)       ((inode)->i_flags & S_DEAD)
 #define IS_NOCMTIME(inode)      ((inode)->i_flags & S_NOCMTIME)
@@ -2175,7 +2203,7 @@ static inline int __mandatory_lock(struct inode *ino)
 }
 
 /*
- * ... and these candidates should be on MS_MANDLOCK mounted fs,
+ * ... and these candidates should be on SB_MANDLOCK mounted fs,
  * otherwise these will be advisory locks
  */
 
@@ -3291,7 +3319,7 @@ static inline int check_sticky(struct inode *dir, struct inode *inode)
 
 static inline void inode_has_no_xattr(struct inode *inode)
 {
-        if (!is_sxid(inode->i_mode) && (inode->i_sb->s_flags & MS_NOSEC))
+        if (!is_sxid(inode->i_mode) && (inode->i_sb->s_flags & SB_NOSEC))
                 inode->i_flags |= S_NOSEC;
 }
 
diff --git a/init/do_mounts.c b/init/do_mounts.c
index c2de5104aad2..f6d4dd764a52 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -373,7 +373,7 @@ static int __init do_mount_root(char *name, char *fs, int flags, void *data)
         printk(KERN_INFO
                "VFS: Mounted root (%s filesystem)%s on device %u:%u.\n",
                s->s_type->name,
-               s->s_flags & MS_RDONLY ?  " readonly" : "",
+               sb_rdonly(s) ? " readonly" : "",
                MAJOR(ROOT_DEV), MINOR(ROOT_DEV));
         return 0;
 }
@@ -420,8 +420,8 @@ retry:
 #endif
                 panic("VFS: Unable to mount root fs on %s", b);
         }
-        if (!(flags & MS_RDONLY)) {
-                flags |= MS_RDONLY;
+        if (!(flags & SB_RDONLY)) {
+                flags |= SB_RDONLY;
                 goto retry;
         }