Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d94d677 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

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: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 15917484

fs/f2fs/segment.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -620,7 +620,9 @@ int f2fs_issue_flush(struct f2fs_sb_info *sbi, nid_t ino) 
		return 0;

		return 0;





	if (!test_opt(sbi, FLUSH_MERGE)) {

	if (!test_opt(sbi, FLUSH_MERGE)) {

		atomic_inc(&fcc->issing_flush);

		ret = submit_flush_wait(sbi, ino);

		ret = submit_flush_wait(sbi, ino);

		atomic_dec(&fcc->issing_flush);

		atomic_inc(&fcc->issued_flush);

		atomic_inc(&fcc->issued_flush);

		return ret;

		return ret;

	}

	}