diff options
| author | Chao Yu <yuchao0@huawei.com> | 2020-09-21 14:53:14 +0200 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2020-09-29 10:48:33 +0200 |
| commit | d0660122dced9768aadfa450f723d857464a4137 (patch) | |
| tree | fcda98f856188d6767950c3860229386a42d1b98 /fs | |
| parent | f2fs: do sanity check on zoned block device path (diff) | |
| download | linux-d0660122dced9768aadfa450f723d857464a4137.tar.xz linux-d0660122dced9768aadfa450f723d857464a4137.zip | |
f2fs: relocate blkzoned feature check
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/f2fs/super.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index a9b19665f9df..bbe993cc44ff 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -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); |