summaryrefslogtreecommitdiffstats
path: root/fs/minix/inode.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/minix/inode.c')
-rw-r--r--fs/minix/inode.c6
1 files changed, 3 insertions, 3 deletions
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)
42 int i; 42 int i;
43 struct minix_sb_info *sbi = minix_sb(sb); 43 struct minix_sb_info *sbi = minix_sb(sb);
44 44
45 if (!(sb->s_flags & MS_RDONLY)) { 45 if (!sb_rdonly(sb)) {
46 if (sbi->s_version != MINIX_V3) /* s_state is now out from V3 sb */ 46 if (sbi->s_version != MINIX_V3) /* s_state is now out from V3 sb */
47 sbi->s_ms->s_state = sbi->s_mount_state; 47 sbi->s_ms->s_state = sbi->s_mount_state;
48 mark_buffer_dirty(sbi->s_sbh); 48 mark_buffer_dirty(sbi->s_sbh);
@@ -125,7 +125,7 @@ static int minix_remount (struct super_block * sb, int * flags, char * data)
125 125
126 sync_filesystem(sb); 126 sync_filesystem(sb);
127 ms = sbi->s_ms; 127 ms = sbi->s_ms;
128 if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) 128 if ((bool)(*flags & MS_RDONLY) == sb_rdonly(sb))
129 return 0; 129 return 0;
130 if (*flags & MS_RDONLY) { 130 if (*flags & MS_RDONLY) {
131 if (ms->s_state & MINIX_VALID_FS || 131 if (ms->s_state & MINIX_VALID_FS ||
@@ -293,7 +293,7 @@ static int minix_fill_super(struct super_block *s, void *data, int silent)
293 if (!s->s_root) 293 if (!s->s_root)
294 goto out_no_root; 294 goto out_no_root;
295 295
296 if (!(s->s_flags & MS_RDONLY)) { 296 if (!sb_rdonly(s)) {
297 if (sbi->s_version != MINIX_V3) /* s_state is now out from V3 sb */ 297 if (sbi->s_version != MINIX_V3) /* s_state is now out from V3 sb */
298 ms->s_state &= ~MINIX_VALID_FS; 298 ms->s_state &= ~MINIX_VALID_FS;
299 mark_buffer_dirty(bh); 299 mark_buffer_dirty(bh);