summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Le Moal <damien.lemoal@wdc.com>2017-05-26 10:04:40 +0200
committerJaegeuk Kim <jaegeuk@kernel.org>2017-07-04 11:10:42 +0200
commitacfd2810c75b0625897fc119a2d3a9c26cc0e405 (patch)
treee789ef766955af8fc384f22e42a02530924c318e
parentf2fs: don't bother checking for encryption key in ->write_iter() (diff)
downloadlinux-acfd2810c75b0625897fc119a2d3a9c26cc0e405.tar.xz
linux-acfd2810c75b0625897fc119a2d3a9c26cc0e405.zip
f2fs: Do not issue small discards in LFS mode
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>
-rw-r--r--fs/f2fs/segment.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index a8f4c8146714..de6738b82745 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -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,