f2fs: give RO message when recovering superblock
authorJaegeuk Kim <jaegeuk@kernel.org>
Wed, 23 Mar 2016 17:42:01 +0000 (10:42 -0700)
committerJaegeuk Kim <jaegeuk@kernel.org>
Fri, 15 Apr 2016 15:49:47 +0000 (08:49 -0700)
When one of superblocks is missing, f2fs recovers it with the valid one.
But, even if f2fs is mounted as RO, we'd better notify that too.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/super.c

index 006f87d69921da05e071f41dc023a5d812116779..ffe4616376ca9fb4025bd7086751681038ca59f9 100644 (file)
@@ -1298,6 +1298,9 @@ int f2fs_commit_super(struct f2fs_sb_info *sbi, bool recover)
        struct buffer_head *bh;
        int err;
 
+       if (f2fs_readonly(sbi->sb) || bdev_read_only(sbi->sb->s_bdev))
+               return -EROFS;
+
        /* write back-up superblock first */
        bh = sb_getblk(sbi->sb, sbi->valid_super_block ? 0: 1);
        if (!bh)
@@ -1565,7 +1568,7 @@ try_onemore:
        kfree(options);
 
        /* recover broken superblock */
-       if (recovery && !f2fs_readonly(sb) && !bdev_read_only(sb->s_bdev)) {
+       if (recovery) {
                err = f2fs_commit_super(sbi, true);
                f2fs_msg(sb, KERN_INFO,
                        "Try to recover %dth superblock, ret: %ld",