diff options
author | Chao Yu <yuchao0@huawei.com> | 2018-10-24 17:24:10 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-13 08:51:48 +0100 |
commit | c1054aeba939e7b14b1dc5137474fc38242cba11 (patch) | |
tree | ff4b43988e12f0031b5f7d0c46f39e36cae26584 /fs/f2fs | |
parent | 2ba4f54b60e149cf447bec8b7136e7f84b74eb26 (diff) | |
download | linux-stable-c1054aeba939e7b14b1dc5137474fc38242cba11.tar.gz linux-stable-c1054aeba939e7b14b1dc5137474fc38242cba11.tar.bz2 linux-stable-c1054aeba939e7b14b1dc5137474fc38242cba11.zip |
f2fs: fix to account preflush command for noflush_merge mode
[ 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>
Diffstat (limited to 'fs/f2fs')
-rw-r--r-- | fs/f2fs/segment.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index a807a8d5e38f..0e3e590a250f 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; } |