f2fs: merge FUA command with the existing writes

FUA writes can be merged to the existing write IOs.

Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 7961e0ddfca3aaa332b7dbd4985ae7766551834f..30cb2f230690e798a298f882fda1457cf1f02407 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -733,9 +733,11 @@ static bool page_is_mergeable(struct f2fs_sb_info *sbi, struct bio *bio,
 static bool io_type_is_mergeable(struct f2fs_bio_info *io,
                                                struct f2fs_io_info *fio)
 {
+       blk_opf_t mask = ~(REQ_PREFLUSH | REQ_FUA);
+
        if (io->fio.op != fio->op)
                return false;
-       return io->fio.op_flags == fio->op_flags;
+       return (io->fio.op_flags & mask) == (fio->op_flags & mask);
 }
 
 static bool io_is_mergeable(struct f2fs_sb_info *sbi, struct bio *bio,