f2fs: fix to add missing F2FS_IO_ALIGNED() condition

In f2fs_allocate_data_block(), we will reset fio.retry for IO
alignment feature instead of IO serialization feature.

In addition, spread F2FS_IO_ALIGNED() to check IO alignment
feature status explicitly.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index a3e2ce5a6b22908d769833f3a6fbb10ad77292ab..adc64d514b797bc402879d7174bf4b32e412b186 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -294,6 +294,9 @@ static inline void __submit_bio(struct f2fs_sb_info *sbi,
                if (test_opt(sbi, LFS) && current->plug)
                        blk_finish_plug(current->plug);
 
+               if (F2FS_IO_ALIGNED(sbi))
+                       goto submit_io;
+
                start = bio->bi_iter.bi_size >> F2FS_BLKSIZE_BITS;
                start %= F2FS_IO_SIZE(sbi);
 
@@ -607,7 +610,8 @@ next:
                __submit_merged_bio(io);
 alloc_new:
        if (io->bio == NULL) {
-               if ((fio->type == DATA || fio->type == NODE) &&
+               if (F2FS_IO_ALIGNED(sbi) &&
+                               (fio->type == DATA || fio->type == NODE) &&
                                fio->new_blkaddr & F2FS_IO_SIZE_MASK(sbi)) {
                        dec_page_count(sbi, WB_DATA_TYPE(bio_page));
                        fio->retry = true;

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 204524943bc6da1f9667a0dd2e81e8c803437faa..8087095814819d21dc2fa056b5a776dc2527699e 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -3116,12 +3116,14 @@ void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,
                f2fs_inode_chksum_set(sbi, page);
        }
 
+       if (F2FS_IO_ALIGNED(sbi))
+               fio->retry = false;
+
        if (add_list) {
                struct f2fs_bio_info *io;
 
                INIT_LIST_HEAD(&fio->list);
                fio->in_list = true;
-               fio->retry = false;
                io = sbi->write_io[fio->type] + fio->temp;
                spin_lock(&io->io_lock);
                list_add_tail(&fio->list, &io->io_list);