aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJan Kara2017-05-02 10:03:47 -0500
committerJaegeuk Kim2017-05-03 16:30:18 -0500
commit3adc5fcb7edf5f8dfe8d37dcb50ba6b30077c905 (patch)
treeab8cdc590341ea5bdd2ee12b781648b18fef9d5f /fs
parent5b0ef73c9d19517467e0cb36158164bf097fe148 (diff)
downloadkernel-3adc5fcb7edf5f8dfe8d37dcb50ba6b30077c905.tar.gz
kernel-3adc5fcb7edf5f8dfe8d37dcb50ba6b30077c905.tar.xz
kernel-3adc5fcb7edf5f8dfe8d37dcb50ba6b30077c905.zip
f2fs: Make flush bios explicitely sync
Commit b685d3d65ac7 "block: treat REQ_FUA and REQ_PREFLUSH as synchronous" removed REQ_SYNC flag from WRITE_{FUA|PREFLUSH|...} definitions. generic_make_request_checks() however strips REQ_FUA and REQ_PREFLUSH flags from a bio when the storage doesn't report volatile write cache and thus write effectively becomes asynchronous which can lead to performance regressions. Fix the problem by making sure all bios which are synchronous are properly marked with REQ_SYNC. Fixes: b685d3d65ac791406e0dfd8779cc9b3707fea5a3 Cc: stable@vger.kernel.org # 4.9+ CC: Jaegeuk Kim <jaegeuk@kernel.org> CC: linux-f2fs-devel@lists.sourceforge.net Signed-off-by: Jan Kara <jack@suse.cz> Acked-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/f2fs/data.c2
-rw-r--r--fs/f2fs/segment.c2
-rw-r--r--fs/f2fs/super.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 1254986dd6eb..7c0f6bdf817d 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -309,7 +309,7 @@ static void __f2fs_submit_merged_bio(struct f2fs_sb_info *sbi,
309 if (type >= META_FLUSH) { 309 if (type >= META_FLUSH) {
310 io->fio.type = META_FLUSH; 310 io->fio.type = META_FLUSH;
311 io->fio.op = REQ_OP_WRITE; 311 io->fio.op = REQ_OP_WRITE;
312 io->fio.op_flags = REQ_META | REQ_PRIO; 312 io->fio.op_flags = REQ_META | REQ_PRIO | REQ_SYNC;
313 if (!test_opt(sbi, NOBARRIER)) 313 if (!test_opt(sbi, NOBARRIER))
314 io->fio.op_flags |= REQ_PREFLUSH | REQ_FUA; 314 io->fio.op_flags |= REQ_PREFLUSH | REQ_FUA;
315 } 315 }
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 6e1c8cf75749..de31030b5041 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -446,7 +446,7 @@ static int __submit_flush_wait(struct f2fs_sb_info *sbi,
446 struct bio *bio = f2fs_bio_alloc(0); 446 struct bio *bio = f2fs_bio_alloc(0);
447 int ret; 447 int ret;
448 448
449 bio->bi_opf = REQ_OP_WRITE | REQ_PREFLUSH; 449 bio->bi_opf = REQ_OP_WRITE | REQ_SYNC | REQ_PREFLUSH;
450 bio->bi_bdev = bdev; 450 bio->bi_bdev = bdev;
451 ret = submit_bio_wait(bio); 451 ret = submit_bio_wait(bio);
452 bio_put(bio); 452 bio_put(bio);
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 9a14b2590337..83355ec4a92c 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1325,7 +1325,7 @@ static int __f2fs_commit_super(struct buffer_head *bh,
1325 unlock_buffer(bh); 1325 unlock_buffer(bh);
1326 1326
1327 /* it's rare case, we can do fua all the time */ 1327 /* it's rare case, we can do fua all the time */
1328 return __sync_dirty_buffer(bh, REQ_PREFLUSH | REQ_FUA); 1328 return __sync_dirty_buffer(bh, REQ_SYNC | REQ_PREFLUSH | REQ_FUA);
1329} 1329}
1330 1330
1331static inline bool sanity_check_area_boundary(struct f2fs_sb_info *sbi, 1331static inline bool sanity_check_area_boundary(struct f2fs_sb_info *sbi,