f2fs: Do not issue small discards in LFS mode
authorDamien Le Moal <damien.lemoal@wdc.com>
Fri, 26 May 2017 08:04:40 +0000 (17:04 +0900)
committerJaegeuk Kim <jaegeuk@kernel.org>
Tue, 4 Jul 2017 09:10:42 +0000 (02:10 -0700)
clear_prefree_segments() issues small discards after discarding full
segments. These small discards may not be section aligned, so not zone
aligned on a zoned block device, causing __f2fs_iissue_discard_zone() to fail.
Fix this by not issuing small discards for a volume mounted with the BLKZONED
feature enabled.

Cc: stable@vger.kernel.org
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/segment.c

index a8f4c81..de6738b 100644 (file)
@@ -1337,7 +1337,8 @@ find_next:
                                        sbi->blocks_per_seg, cur_pos);
                        len = next_pos - cur_pos;
 
-                       if (force && len < cpc->trim_minlen)
+                       if (f2fs_sb_mounted_blkzoned(sbi->sb) ||
+                           (force && len < cpc->trim_minlen))
                                goto skip;
 
                        f2fs_issue_discard(sbi, entry->start_blkaddr + cur_pos,