f2fs: relocate blkzoned feature check
authorChao Yu <yuchao0@huawei.com>
Mon, 21 Sep 2020 12:53:14 +0000 (20:53 +0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Tue, 29 Sep 2020 08:48:33 +0000 (01:48 -0700)
Relocate blkzoned feature check into parse_options() like
other feature check.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/super.c

index a9b1966..bbe993c 100644 (file)
@@ -970,6 +970,17 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
                return -EINVAL;
        }
 #endif
+       /*
+        * The BLKZONED feature indicates that the drive was formatted with
+        * zone alignment optimization. This is optional for host-aware
+        * devices, but mandatory for host-managed zoned block devices.
+        */
+#ifndef CONFIG_BLK_DEV_ZONED
+       if (f2fs_sb_has_blkzoned(sbi)) {
+               f2fs_err(sbi, "Zoned block device support is not enabled");
+               return -EINVAL;
+       }
+#endif
 
        if (F2FS_IO_SIZE_BITS(sbi) && !f2fs_lfs_mode(sbi)) {
                f2fs_err(sbi, "Should set mode=lfs with %uKB-sized IO",
@@ -3493,18 +3504,6 @@ try_onemore:
                sbi->s_chksum_seed = f2fs_chksum(sbi, ~0, raw_super->uuid,
                                                sizeof(raw_super->uuid));
 
-       /*
-        * The BLKZONED feature indicates that the drive was formatted with
-        * zone alignment optimization. This is optional for host-aware
-        * devices, but mandatory for host-managed zoned block devices.
-        */
-#ifndef CONFIG_BLK_DEV_ZONED
-       if (f2fs_sb_has_blkzoned(sbi)) {
-               f2fs_err(sbi, "Zoned block device support is not enabled");
-               err = -EOPNOTSUPP;
-               goto free_sb_buf;
-       }
-#endif
        default_options(sbi);
        /* parse mount options */
        options = kstrdup((const char *)data, GFP_KERNEL);