aboutsummaryrefslogtreecommitdiffstats
path: root/fs/minix
diff options
context:
space:
mode:
Diffstat (limited to 'fs/minix')
-rw-r--r--fs/minix/inode.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/fs/minix/inode.c b/fs/minix/inode.c
index c811c19d31be..fa8b612b8ce2 100644
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
@@ -262,23 +262,6 @@ static int minix_fill_super(struct super_block *s, void *data, int silent)
262 goto out_no_root; 262 goto out_no_root;
263 } 263 }
264 264
265 ret = -ENOMEM;
266 s->s_root = d_alloc_root(root_inode);
267 if (!s->s_root)
268 goto out_iput;
269
270 if (!(s->s_flags & MS_RDONLY)) {
271 if (sbi->s_version != MINIX_V3) /* s_state is now out from V3 sb */
272 ms->s_state &= ~MINIX_VALID_FS;
273 mark_buffer_dirty(bh);
274 }
275 if (!(sbi->s_mount_state & MINIX_VALID_FS))
276 printk("MINIX-fs: mounting unchecked file system, "
277 "running fsck is recommended\n");
278 else if (sbi->s_mount_state & MINIX_ERROR_FS)
279 printk("MINIX-fs: mounting file system with errors, "
280 "running fsck is recommended\n");
281
282 /* Apparently minix can create filesystems that allocate more blocks for 265 /* Apparently minix can create filesystems that allocate more blocks for
283 * the bitmaps than needed. We simply ignore that, but verify it didn't 266 * the bitmaps than needed. We simply ignore that, but verify it didn't
284 * create one with not enough blocks and bail out if so. 267 * create one with not enough blocks and bail out if so.
@@ -299,6 +282,23 @@ static int minix_fill_super(struct super_block *s, void *data, int silent)
299 goto out_iput; 282 goto out_iput;
300 } 283 }
301 284
285 ret = -ENOMEM;
286 s->s_root = d_alloc_root(root_inode);
287 if (!s->s_root)
288 goto out_iput;
289
290 if (!(s->s_flags & MS_RDONLY)) {
291 if (sbi->s_version != MINIX_V3) /* s_state is now out from V3 sb */
292 ms->s_state &= ~MINIX_VALID_FS;
293 mark_buffer_dirty(bh);
294 }
295 if (!(sbi->s_mount_state & MINIX_VALID_FS))
296 printk("MINIX-fs: mounting unchecked file system, "
297 "running fsck is recommended\n");
298 else if (sbi->s_mount_state & MINIX_ERROR_FS)
299 printk("MINIX-fs: mounting file system with errors, "
300 "running fsck is recommended\n");
301
302 return 0; 302 return 0;
303 303
304out_iput: 304out_iput: