f2fs: Make flush bios explicitely sync

commit 3adc5fcb7edf5f8dfe8d37dcb50ba6b30077c905 upstream.

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: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 1602b4bccae61e8ac9fcff3d4810b953294773e2..dd24476e8d2c631d6db5f61c6c5eb453739f9700 100644 (file)
--- 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,
        if (type >= META_FLUSH) {
                io->fio.type = META_FLUSH;
                io->fio.op = REQ_OP_WRITE;
-               io->fio.op_flags = REQ_META | REQ_PRIO;
+               io->fio.op_flags = REQ_META | REQ_PRIO | REQ_SYNC;
                if (!test_opt(sbi, NOBARRIER))
                        io->fio.op_flags |= REQ_PREFLUSH | REQ_FUA;
        }

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 0f051e3ef535d4f363f6951f12aca5103c8f877d..56670c5058b70bdee4c372225e4c06e39e9e8aeb 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -416,7 +416,7 @@ static int __submit_flush_wait(struct block_device *bdev)
        struct bio *bio = f2fs_bio_alloc(0);
        int ret;
 
-       bio->bi_opf = REQ_OP_WRITE | REQ_PREFLUSH;
+       bio->bi_opf = REQ_OP_WRITE | REQ_SYNC | REQ_PREFLUSH;
        bio->bi_bdev = bdev;
        ret = submit_bio_wait(bio);
        bio_put(bio);

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 858aef564a5876075b24b2ab4ef68c1d851a8dcf..5ca78308d5ec9b827a9229b1b022b166e38985eb 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1307,7 +1307,7 @@ static int __f2fs_commit_super(struct buffer_head *bh,
        unlock_buffer(bh);
 
        /* it's rare case, we can do fua all the time */
-       return __sync_dirty_buffer(bh, REQ_PREFLUSH | REQ_FUA);
+       return __sync_dirty_buffer(bh, REQ_SYNC | REQ_PREFLUSH | REQ_FUA);
 }
 
 static inline bool sanity_check_area_boundary(struct f2fs_sb_info *sbi,