From: Damien Le Moal <damien.lemoal@wdc.com>
Date: Fri, 26 May 2017 08:04:40 +0000 (+0900)
Subject: f2fs: Do not issue small discards in LFS mode
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=acfd2810c75b0625897fc119a2d3a9c26cc0e405;p=openwrt%2Fstaging%2Fblogic.git

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>
---

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,