commit 663f387b713089463e37761bfa2561972c7f45ff
author Chao Yu <yuchao0@huawei.com> Wed Jun 14 23:00:55 2017 +0800
committer Jaegeuk Kim <jaegeuk@kernel.org> Tue Jul 04 02:11:47 2017 -0700
tree 48292077d39a12217f78d2206007e9bcc0afe9d0
parent 67773a1fbdcb5be4a0490b1dd2a5975784ef40df

f2fs: set CP_TRIMMED_FLAG correctly

Don't set CP_TRIMMED_FLAG for non-zoned block device or discard
unsupported device, it can avoid to trigger unneeded checkpoint for
that kind of device.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

fs/f2fs/super.c

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 9081570..8e39b85 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -587,7 +587,7 @@ static void f2fs_put_super(struct super_block *sb)
 	/* be sure to wait for any on-going discard commands */
 	f2fs_wait_discard_bios(sbi);
 
-	if (!sbi->discard_blks) {
+	if (f2fs_discard_en(sbi) && !sbi->discard_blks) {
 		struct cp_control cpc = {
 			.reason = CP_UMOUNT | CP_TRIMMED,
 		};