From: Jaegeuk Kim <jaegeuk@kernel.org>
Date: Mon, 6 Feb 2017 21:57:58 +0000 (-0800)
Subject: f2fs: remove preflush for nobarrier case
X-Git-Tag: v4.11-rc1~34^2~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f54f51f46f69f3ccde2b65e682a51b0aa6199c3;p=thirdparty%2Fkernel%2Flinux.git

f2fs: remove preflush for nobarrier case

This patch removes REQ_PREFLUSH in the nobarrier case.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index d14cc8be14f1d..8c61fa7fd27d0 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -306,9 +306,9 @@ static void __f2fs_submit_merged_bio(struct f2fs_sb_info *sbi,
 	if (type >= META_FLUSH) {
 		io->fio.type = META_FLUSH;
 		io->fio.op = REQ_OP_WRITE;
-		io->fio.op_flags = REQ_PREFLUSH | REQ_META | REQ_PRIO;
+		io->fio.op_flags = REQ_META | REQ_PRIO;
 		if (!test_opt(sbi, NOBARRIER))
-			io->fio.op_flags |= REQ_FUA;
+			io->fio.op_flags |= REQ_PREFLUSH | REQ_FUA;
 	}
 	__submit_merged_bio(io);
 out: