f2fs: enable realtime discard iff device supports discard
Chao Yu
maintainerPATCH 1/1 f2fs: enable realtime discard iff device supports discard
Let's only enable realtime discard if and only if device supports discard functionality.
Signed-off-by Chao Yu <[email protected]>
--- fs/f2fs/super.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
fs/f2fs/super.c +7 -2
@@ -660,10 +660,14 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)return -EINVAL ;break ;case Opt_discard: +if (!f2fs_hw_support_discard (sbi)) { +f2fs_warn (sbi,"device does not support discard" ); +return -EINVAL ; + }set_opt (sbi,DISCARD );break ;case Opt_nodiscard: -if (f2fs_sb_has_blkzoned (sbi)) { +if (f2fs_hw_should_discard (sbi)) {f2fs_warn (sbi,"discard is required for zoned block devices" );return -EINVAL ; }
@@ -1999,7 +2003,8 @@ static void default_options(struct f2fs_sb_info *sbi)F2FS_OPTION (sbi).unusable_cap =0 ; sbi->sb->s_flags |=SB_LAZYTIME ;set_opt (sbi,FLUSH_MERGE ); -set_opt (sbi,DISCARD ); +if (f2fs_hw_support_discard (sbi) ||f2fs_hw_should_discard (sbi)) +set_opt (sbi,DISCARD );if (f2fs_sb_has_blkzoned (sbi)) {F2FS_OPTION (sbi).fs_mode =FS_MODE_LFS ;F2FS_OPTION (sbi).discard_unit =DISCARD_UNIT_SECTION ;
Signature · 1 line
2.32.0