f2fs: relocate blkzoned feature check (d0660122) · Commits · 戴 / test

fs/f2fs/super.c

+11 −12

Original line number	Diff line number	Diff line
		@@ -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);