[PATCH 4.19 102/243] f2fs: fix to account preflush command for noflush_merge mode

Greg Kroah-Hartman
2019-12-11T15:52:52Z

From: Chao Yu <yuchao0@huawei.com>

[ Upstream commit a8075dc484cf10ebdb07bee2b17322fb0a846309 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/f2fs/segment.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index a807a8d5e38f0..0e3e590a250f7 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -637,7 +637,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;
}
--
2.20.1