4 files changed, 12 insertions, 12 deletions

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