f2fs: defer readonly check vs norecovery

Defer the readonly-vs-norecovery check until after option parsing is done
so that option parsing does not require an active superblock for the test.
Add a helpful message, while we're at it.

(I think could be moved back into parsing after we switch to the new mount
API if desired, as the fs context will have RO state available.)

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 4ffa95dd41dfc11a0d196e60203eeee6b9a5d964..3589d1ff97a363787625b315ac4957d9c126a19f 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -730,10 +730,8 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
                        set_opt(sbi, DISABLE_ROLL_FORWARD);
                        break;
                case Opt_norecovery:
-                       /* this option mounts f2fs with ro */
+                       /* requires ro mount, checked in f2fs_default_check */
                        set_opt(sbi, NORECOVERY);
-                       if (!f2fs_readonly(sb))
-                               return -EINVAL;
                        break;
                case Opt_discard:
                        if (!f2fs_hw_support_discard(sbi)) {
@@ -1417,6 +1415,12 @@ static int f2fs_default_check(struct f2fs_sb_info *sbi)
                f2fs_err(sbi, "Allow to mount readonly mode only");
                return -EROFS;
        }
+
+       if (test_opt(sbi, NORECOVERY) && !f2fs_readonly(sbi->sb)) {
+               f2fs_err(sbi, "norecovery requires readonly mount");
+               return -EINVAL;
+       }
+
        return 0;
 }