f2fs: fix to account preflush command for noflush_merge mode

chaseyu · Jaegeuk Kim · commit a8075dc484cf · 2018-11-26T15:53:55.000-08:00
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 &lt;yuchao0@huawei.com&gt;
Signed-off-by: Jaegeuk Kim &lt;jaegeuk@kernel.org&gt;
diff --git 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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -620,7 +620,9 @@ int f2fs_issue_flush(struct f2fs_sb_info *sbi, nid_t ino)`
`620`	`620`	`return 0;`
`621`	`621`
`622`	`622`	`if (!test_opt(sbi, FLUSH_MERGE)) {`
	`623`	`+ atomic_inc(&fcc->issing_flush);`
`623`	`624`	`ret = submit_flush_wait(sbi, ino);`
	`625`	`+ atomic_dec(&fcc->issing_flush);`
`624`	`626`	`atomic_inc(&fcc->issued_flush);`
`625`	`627`	`return ret;`
`626`	`628`	`}`