3 files changed, 9 insertions, 10 deletions

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);