From: Chao Yu <yuchao0@huawei.com>
Date: Wed, 24 Oct 2018 09:24:10 +0000 (+0800)
Subject: f2fs: fix to account preflush command for noflush_merge mode
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a8075dc484cf10ebdb07bee2b17322fb0a846309;p=linux.git

f2fs: fix to account preflush command for noflush_merge mode

Previously, we only account preflush command for flush_merge mode,
so for noflush_merge mode, we can not know in-flight preflush
command count, fix it.

Signed-off-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 6edcf8391dd3d..d161f5a8b3d6e 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -620,7 +620,9 @@ int f2fs_issue_flush(struct f2fs_sb_info *sbi, nid_t ino)
 		return 0;
 
 	if (!test_opt(sbi, FLUSH_MERGE)) {
+		atomic_inc(&fcc->issing_flush);
 		ret = submit_flush_wait(sbi, ino);
+		atomic_dec(&fcc->issing_flush);
 		atomic_inc(&fcc->issued_flush);
 		return ret;
 	}