1 files changed, 26 insertions, 26 deletions

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 0556cd036b69..7c46693a14d7 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -422,7 +422,7 @@ static void ext4_handle_error(struct super_block *sb)
                  * before ->s_flags update
                  */
                 smp_wmb();
-                sb->s_flags |= MS_RDONLY;
+                sb->s_flags |= SB_RDONLY;
         }
         if (test_opt(sb, ERRORS_PANIC)) {
                 if (EXT4_SB(sb)->s_journal &&
@@ -635,7 +635,7 @@ void __ext4_abort(struct super_block *sb, const char *function,
                  * before ->s_flags update
                  */
                 smp_wmb();
-                sb->s_flags |= MS_RDONLY;
+                sb->s_flags |= SB_RDONLY;
                 if (EXT4_SB(sb)->s_journal)
                         jbd2_journal_abort(EXT4_SB(sb)->s_journal, -EIO);
                 save_error_info(sb, function, line);
@@ -1682,10 +1682,10 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token,
                 sb->s_flags |= SB_I_VERSION;
                 return 1;
         case Opt_lazytime:
-                sb->s_flags |= MS_LAZYTIME;
+                sb->s_flags |= SB_LAZYTIME;
                 return 1;
         case Opt_nolazytime:
-                sb->s_flags &= ~MS_LAZYTIME;
+                sb->s_flags &= ~SB_LAZYTIME;
                 return 1;
         }
 
@@ -2116,7 +2116,7 @@ static int ext4_setup_super(struct super_block *sb, struct ext4_super_block *es,
         if (le32_to_cpu(es->s_rev_level) > EXT4_MAX_SUPP_REV) {
                 ext4_msg(sb, KERN_ERR, "revision level too high, "
                          "forcing read-only mode");
-                res = MS_RDONLY;
+                res = SB_RDONLY;
         }
         if (read_only)
                 goto done;
@@ -2429,7 +2429,7 @@ static void ext4_orphan_cleanup(struct super_block *sb,
 
         if (EXT4_SB(sb)->s_mount_state & EXT4_ERROR_FS) {
                 /* don't clear list on RO mount w/ errors */
-                if (es->s_last_orphan && !(s_flags & MS_RDONLY)) {
+                if (es->s_last_orphan && !(s_flags & SB_RDONLY)) {
                         ext4_msg(sb, KERN_INFO, "Errors on filesystem, "
                                   "clearing orphan list.\n");
                         es->s_last_orphan = 0;
@@ -2438,19 +2438,19 @@ static void ext4_orphan_cleanup(struct super_block *sb,
                 return;
         }
 
-        if (s_flags & MS_RDONLY) {
+        if (s_flags & SB_RDONLY) {
                 ext4_msg(sb, KERN_INFO, "orphan cleanup on readonly fs");
-                sb->s_flags &= ~MS_RDONLY;
+                sb->s_flags &= ~SB_RDONLY;
         }
 #ifdef CONFIG_QUOTA
         /* Needed for iput() to work correctly and not trash data */
-        sb->s_flags |= MS_ACTIVE;
+        sb->s_flags |= SB_ACTIVE;
 
         /*
          * Turn on quotas which were not enabled for read-only mounts if
          * filesystem has quota feature, so that they are updated correctly.
          */
-        if (ext4_has_feature_quota(sb) && (s_flags & MS_RDONLY)) {
+        if (ext4_has_feature_quota(sb) && (s_flags & SB_RDONLY)) {
                 int ret = ext4_enable_quotas(sb);
 
                 if (!ret)
@@ -2539,7 +2539,7 @@ static void ext4_orphan_cleanup(struct super_block *sb,
                 }
         }
 #endif
-        sb->s_flags = s_flags; /* Restore MS_RDONLY status */
+        sb->s_flags = s_flags; /* Restore SB_RDONLY status */
 }
 
 /*
@@ -2741,7 +2741,7 @@ static int ext4_feature_set_ok(struct super_block *sb, int readonly)
 
         if (ext4_has_feature_readonly(sb)) {
                 ext4_msg(sb, KERN_INFO, "filesystem is read-only");
-                sb->s_flags |= MS_RDONLY;
+                sb->s_flags |= SB_RDONLY;
                 return 1;
         }
 
@@ -3623,8 +3623,8 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
                 sb->s_iflags |= SB_I_CGROUPWB;
         }
 
-        sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
-                (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
+        sb->s_flags = (sb->s_flags & ~SB_POSIXACL) |
+                (test_opt(sb, POSIX_ACL) ? SB_POSIXACL : 0);
 
         if (le32_to_cpu(es->s_rev_level) == EXT4_GOOD_OLD_REV &&
             (ext4_has_compat_features(sb) ||
@@ -4199,7 +4199,7 @@ no_journal:
         }
 
         if (ext4_setup_super(sb, es, sb_rdonly(sb)))
-                sb->s_flags |= MS_RDONLY;
+                sb->s_flags |= SB_RDONLY;
 
         /* determine the minimum size of new large inodes, if present */
         if (sbi->s_inode_size > EXT4_GOOD_OLD_INODE_SIZE &&
@@ -4693,7 +4693,7 @@ static int ext4_commit_super(struct super_block *sb, int sync)
          * the clock is set in the future, and this will cause e2fsck
          * to complain and force a full file system check.
          */
-        if (!(sb->s_flags & MS_RDONLY))
+        if (!(sb->s_flags & SB_RDONLY))
                 es->s_wtime = cpu_to_le32(get_seconds());
         if (sb->s_bdev->bd_part)
                 es->s_kbytes_written =
@@ -5047,8 +5047,8 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
         if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
                 ext4_abort(sb, "Abort forced by user");
 
-        sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
-                (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
+        sb->s_flags = (sb->s_flags & ~SB_POSIXACL) |
+                (test_opt(sb, POSIX_ACL) ? SB_POSIXACL : 0);
 
         es = sbi->s_es;
 
@@ -5057,16 +5057,16 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
                 set_task_ioprio(sbi->s_journal->j_task, journal_ioprio);
         }
 
-        if (*flags & MS_LAZYTIME)
-                sb->s_flags |= MS_LAZYTIME;
+        if (*flags & SB_LAZYTIME)
+                sb->s_flags |= SB_LAZYTIME;
 
-        if ((bool)(*flags & MS_RDONLY) != sb_rdonly(sb)) {
+        if ((bool)(*flags & SB_RDONLY) != sb_rdonly(sb)) {
                 if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED) {
                         err = -EROFS;
                         goto restore_opts;
                 }
 
-                if (*flags & MS_RDONLY) {
+                if (*flags & SB_RDONLY) {
                         err = sync_filesystem(sb);
                         if (err < 0)
                                 goto restore_opts;
@@ -5078,7 +5078,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
                          * First of all, the unconditional stuff we have to do
                          * to disable replay of the journal when we next remount
                          */
-                        sb->s_flags |= MS_RDONLY;
+                        sb->s_flags |= SB_RDONLY;
 
                         /*
                          * OK, test if we are remounting a valid rw partition
@@ -5140,7 +5140,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
                                 ext4_clear_journal_err(sb, es);
                         sbi->s_mount_state = le16_to_cpu(es->s_state);
                         if (!ext4_setup_super(sb, es, 0))
-                                sb->s_flags &= ~MS_RDONLY;
+                                sb->s_flags &= ~SB_RDONLY;
                         if (ext4_has_feature_mmp(sb))
                                 if (ext4_multi_mount_protect(sb,
                                                 le64_to_cpu(es->s_mmp_block))) {
@@ -5164,7 +5164,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
         }
 
         ext4_setup_system_zone(sb);
-        if (sbi->s_journal == NULL && !(old_sb_flags & MS_RDONLY))
+        if (sbi->s_journal == NULL && !(old_sb_flags & SB_RDONLY))
                 ext4_commit_super(sb, 1);
 
 #ifdef CONFIG_QUOTA
@@ -5182,7 +5182,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
         }
 #endif
 
-        *flags = (*flags & ~MS_LAZYTIME) | (sb->s_flags & MS_LAZYTIME);
+        *flags = (*flags & ~SB_LAZYTIME) | (sb->s_flags & SB_LAZYTIME);
         ext4_msg(sb, KERN_INFO, "re-mounted. Opts: %s", orig_data);
         kfree(orig_data);
         return 0;