f2fs: remove unnecessary read cases in merged IO flow

Merged IO flow doesn't need to care about read IOs.

f2fs_submit_merged_bio -> f2fs_submit_merged_write
f2fs_submit_merged_bios -> f2fs_submit_merged_writes
f2fs_submit_merged_bio_cond -> f2fs_submit_merged_write_cond

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

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 8d92f82..13828f6 100644 (file)
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -31,7 +31,7 @@ void f2fs_stop_checkpoint(struct f2fs_sb_info *sbi, bool end_io)
        set_ckpt_flags(sbi, CP_ERROR_FLAG);
        sbi->sb->s_flags |= MS_RDONLY;
        if (!end_io)
-               f2fs_flush_merged_bios(sbi);
+               f2fs_flush_merged_writes(sbi);
 }
 
 /*
@@ -247,13 +247,13 @@ static int f2fs_write_meta_page(struct page *page,
        dec_page_count(sbi, F2FS_DIRTY_META);
 
        if (wbc->for_reclaim)
-               f2fs_submit_merged_bio_cond(sbi, page->mapping->host,
-                                               0, page->index, META, WRITE);
+               f2fs_submit_merged_write_cond(sbi, page->mapping->host,
+                                               0, page->index, META);
 
        unlock_page(page);
 
        if (unlikely(f2fs_cp_error(sbi)))
-               f2fs_submit_merged_bio(sbi, META, WRITE);
+               f2fs_submit_merged_write(sbi, META);
 
        return 0;
 
@@ -356,7 +356,7 @@ continue_unlock:
        }
 stop:
        if (nwritten)
-               f2fs_submit_merged_bio(sbi, type, WRITE);
+               f2fs_submit_merged_write(sbi, type);
 
        blk_finish_plug(&plug);
 
@@ -904,7 +904,7 @@ retry:
                 * We should submit bio, since it exists several
                 * wribacking dentry pages in the freeing inode.
                 */
-               f2fs_submit_merged_bio(sbi, DATA, WRITE);
+               f2fs_submit_merged_write(sbi, DATA);
                cond_resched();
        }
        goto retry;
@@ -1293,7 +1293,7 @@ int write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
 
        trace_f2fs_write_checkpoint(sbi->sb, cpc->reason, "finish block_ops");
 
-       f2fs_flush_merged_bios(sbi);
+       f2fs_flush_merged_writes(sbi);
 
        /* this is the case of multiple fstrims without any changes */
        if (cpc->reason & CP_DISCARD) {

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 7c0f6bd..06bb204 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -291,14 +291,12 @@ static bool has_merged_page(struct f2fs_sb_info *sbi, struct inode *inode,
        return ret;
 }
 
-static void __f2fs_submit_merged_bio(struct f2fs_sb_info *sbi,
+static void __f2fs_submit_merged_write(struct f2fs_sb_info *sbi,
                                struct inode *inode, nid_t ino, pgoff_t idx,
-                               enum page_type type, int rw)
+                               enum page_type type)
 {
        enum page_type btype = PAGE_TYPE_OF_BIO(type);
-       struct f2fs_bio_info *io;
-
-       io = is_read_io(rw) ? &sbi->read_io : &sbi->write_io[btype];
+       struct f2fs_bio_info *io = &sbi->write_io[btype];
 
        down_write(&io->io_rwsem);
 
@@ -318,25 +316,24 @@ out:
        up_write(&io->io_rwsem);
 }
 
-void f2fs_submit_merged_bio(struct f2fs_sb_info *sbi, enum page_type type,
-                                                                       int rw)
+void f2fs_submit_merged_write(struct f2fs_sb_info *sbi, enum page_type type)
 {
-       __f2fs_submit_merged_bio(sbi, NULL, 0, 0, type, rw);
+       __f2fs_submit_merged_write(sbi, NULL, 0, 0, type);
 }
 
-void f2fs_submit_merged_bio_cond(struct f2fs_sb_info *sbi,
+void f2fs_submit_merged_write_cond(struct f2fs_sb_info *sbi,
                                struct inode *inode, nid_t ino, pgoff_t idx,
-                               enum page_type type, int rw)
+                               enum page_type type)
 {
        if (has_merged_page(sbi, inode, ino, idx, type))
-               __f2fs_submit_merged_bio(sbi, inode, ino, idx, type, rw);
+               __f2fs_submit_merged_write(sbi, inode, ino, idx, type);
 }
 
-void f2fs_flush_merged_bios(struct f2fs_sb_info *sbi)
+void f2fs_flush_merged_writes(struct f2fs_sb_info *sbi)
 {
-       f2fs_submit_merged_bio(sbi, DATA, WRITE);
-       f2fs_submit_merged_bio(sbi, NODE, WRITE);
-       f2fs_submit_merged_bio(sbi, META, WRITE);
+       f2fs_submit_merged_write(sbi, DATA);
+       f2fs_submit_merged_write(sbi, NODE);
+       f2fs_submit_merged_write(sbi, META);
 }
 
 /*
@@ -368,16 +365,15 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio)
        return 0;
 }
 
-int f2fs_submit_page_mbio(struct f2fs_io_info *fio)
+int f2fs_submit_page_write(struct f2fs_io_info *fio)
 {
        struct f2fs_sb_info *sbi = fio->sbi;
        enum page_type btype = PAGE_TYPE_OF_BIO(fio->type);
-       struct f2fs_bio_info *io;
-       bool is_read = is_read_io(fio->op);
+       struct f2fs_bio_info *io = &sbi->write_io[btype];
        struct page *bio_page;
        int err = 0;
 
-       io = is_read ? &sbi->read_io : &sbi->write_io[btype];
+       f2fs_bug_on(sbi, is_read_io(fio->op));
 
        if (fio->old_blkaddr != NEW_ADDR)
                verify_block_addr(sbi, fio->old_blkaddr);
@@ -388,8 +384,7 @@ int f2fs_submit_page_mbio(struct f2fs_io_info *fio)
        /* set submitted = 1 as a return value */
        fio->submitted = 1;
 
-       if (!is_read)
-               inc_page_count(sbi, WB_DATA_TYPE(bio_page));
+       inc_page_count(sbi, WB_DATA_TYPE(bio_page));
 
        down_write(&io->io_rwsem);
 
@@ -402,12 +397,11 @@ alloc_new:
                if ((fio->type == DATA || fio->type == NODE) &&
                                fio->new_blkaddr & F2FS_IO_SIZE_MASK(sbi)) {
                        err = -EAGAIN;
-                       if (!is_read)
-                               dec_page_count(sbi, WB_DATA_TYPE(bio_page));
+                       dec_page_count(sbi, WB_DATA_TYPE(bio_page));
                        goto out_fail;
                }
                io->bio = __bio_alloc(sbi, fio->new_blkaddr,
-                                               BIO_MAX_PAGES, is_read);
+                                               BIO_MAX_PAGES, false);
                io->fio = *fio;
        }
 
@@ -421,7 +415,7 @@ alloc_new:
        f2fs_trace_ios(fio, 0);
 out_fail:
        up_write(&io->io_rwsem);
-       trace_f2fs_submit_page_mbio(fio->page, fio);
+       trace_f2fs_submit_page_write(fio->page, fio);
        return err;
 }
 
@@ -1321,7 +1315,7 @@ retry_encrypt:
 
        /* flush pending IOs and wait for a while in the ENOMEM case */
        if (PTR_ERR(fio->encrypted_page) == -ENOMEM) {
-               f2fs_flush_merged_bios(fio->sbi);
+               f2fs_flush_merged_writes(fio->sbi);
                congestion_wait(BLK_RW_ASYNC, HZ/50);
                gfp_flags |= __GFP_NOFAIL;
                goto retry_encrypt;
@@ -1513,8 +1507,7 @@ out:
                ClearPageUptodate(page);
 
        if (wbc->for_reclaim) {
-               f2fs_submit_merged_bio_cond(sbi, inode, 0, page->index,
-                                               DATA, WRITE);
+               f2fs_submit_merged_write_cond(sbi, inode, 0, page->index, DATA);
                clear_inode_flag(inode, FI_HOT_DATA);
                remove_dirty_inode(inode);
                submitted = NULL;
@@ -1525,7 +1518,7 @@ out:
                f2fs_balance_fs(sbi, need_balance_fs);
 
        if (unlikely(f2fs_cp_error(sbi))) {
-               f2fs_submit_merged_bio(sbi, DATA, WRITE);
+               f2fs_submit_merged_write(sbi, DATA);
                submitted = NULL;
        }
 
@@ -1684,8 +1677,8 @@ continue_unlock:
                mapping->writeback_index = done_index;
 
        if (last_idx != ULONG_MAX)
-               f2fs_submit_merged_bio_cond(F2FS_M_SB(mapping), mapping->host,
-                                               0, last_idx, DATA, WRITE);
+               f2fs_submit_merged_write_cond(F2FS_M_SB(mapping), mapping->host,
+                                               0, last_idx, DATA);
 
        return ret;
 }

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index e26999a..58697bd 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -879,7 +879,6 @@ struct f2fs_sb_info {
        struct f2fs_sm_info *sm_info;           /* segment manager */
 
        /* for bio operations */
-       struct f2fs_bio_info read_io;                   /* for read bios */
        struct f2fs_bio_info write_io[NR_PAGE_TYPE];    /* for write bios */
        struct mutex wio_mutex[NODE + 1];       /* bio ordering for NODE/DATA */
        int write_io_size_bits;                 /* Write IO size bits */
@@ -2325,14 +2324,13 @@ void destroy_checkpoint_caches(void);
 /*
  * data.c
  */
-void f2fs_submit_merged_bio(struct f2fs_sb_info *sbi, enum page_type type,
-                       int rw);
-void f2fs_submit_merged_bio_cond(struct f2fs_sb_info *sbi,
+void f2fs_submit_merged_write(struct f2fs_sb_info *sbi, enum page_type type);
+void f2fs_submit_merged_write_cond(struct f2fs_sb_info *sbi,
                                struct inode *inode, nid_t ino, pgoff_t idx,
-                               enum page_type type, int rw);
-void f2fs_flush_merged_bios(struct f2fs_sb_info *sbi);
+                               enum page_type type);
+void f2fs_flush_merged_writes(struct f2fs_sb_info *sbi);
 int f2fs_submit_page_bio(struct f2fs_io_info *fio);
-int f2fs_submit_page_mbio(struct f2fs_io_info *fio);
+int f2fs_submit_page_write(struct f2fs_io_info *fio);
 struct block_device *f2fs_target_device(struct f2fs_sb_info *sbi,
                        block_t blk_addr, struct bio *bio);
 int f2fs_target_device_index(struct f2fs_sb_info *sbi, block_t blkaddr);

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index 965fbf5..67b8715 100644 (file)
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -670,7 +670,7 @@ static void move_encrypted_block(struct inode *inode, block_t bidx,
        fio.op = REQ_OP_WRITE;
        fio.op_flags = REQ_SYNC;
        fio.new_blkaddr = newaddr;
-       f2fs_submit_page_mbio(&fio);
+       f2fs_submit_page_write(&fio);
 
        f2fs_update_data_blkaddr(&dn, newaddr);
        set_inode_flag(inode, FI_APPEND_WRITE);
@@ -936,8 +936,8 @@ next:
        }
 
        if (gc_type == FG_GC)
-               f2fs_submit_merged_bio(sbi,
-                               (type == SUM_TYPE_NODE) ? NODE : DATA, WRITE);
+               f2fs_submit_merged_write(sbi,
+                               (type == SUM_TYPE_NODE) ? NODE : DATA);
 
        blk_finish_plug(&plug);
 

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 98351a4..41bb632 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1373,15 +1373,15 @@ static int __write_node_page(struct page *page, bool atomic, bool *submitted,
        up_read(&sbi->node_write);
 
        if (wbc->for_reclaim) {
-               f2fs_submit_merged_bio_cond(sbi, page->mapping->host, 0,
-                                               page->index, NODE, WRITE);
+               f2fs_submit_merged_write_cond(sbi, page->mapping->host, 0,
+                                               page->index, NODE);
                submitted = NULL;
        }
 
        unlock_page(page);
 
        if (unlikely(f2fs_cp_error(sbi))) {
-               f2fs_submit_merged_bio(sbi, NODE, WRITE);
+               f2fs_submit_merged_write(sbi, NODE);
                submitted = NULL;
        }
        if (submitted)
@@ -1518,8 +1518,7 @@ continue_unlock:
        }
 out:
        if (last_idx != ULONG_MAX)
-               f2fs_submit_merged_bio_cond(sbi, NULL, ino, last_idx,
-                                                       NODE, WRITE);
+               f2fs_submit_merged_write_cond(sbi, NULL, ino, last_idx, NODE);
        return ret ? -EIO: 0;
 }
 
@@ -1625,7 +1624,7 @@ continue_unlock:
        }
 out:
        if (nwritten)
-               f2fs_submit_merged_bio(sbi, NODE, WRITE);
+               f2fs_submit_merged_write(sbi, NODE);
        return ret;
 }
 

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index de31030..38bb675 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -328,8 +328,7 @@ static int __commit_inmem_pages(struct inode *inode,
        }
 
        if (last_idx != ULONG_MAX)
-               f2fs_submit_merged_bio_cond(sbi, inode, 0, last_idx,
-                                                       DATA, WRITE);
+               f2fs_submit_merged_write_cond(sbi, inode, 0, last_idx, DATA);
 
        if (!err)
                __revoke_inmem_pages(inode, revoke_list, false, false);
@@ -2150,7 +2149,7 @@ reallocate:
                                        &fio->new_blkaddr, sum, type);
 
        /* writeout dirty page into bdev */
-       err = f2fs_submit_page_mbio(fio);
+       err = f2fs_submit_page_write(fio);
        if (err == -EAGAIN) {
                fio->old_blkaddr = fio->new_blkaddr;
                goto reallocate;
@@ -2177,7 +2176,7 @@ void write_meta_page(struct f2fs_sb_info *sbi, struct page *page)
                fio.op_flags &= ~REQ_META;
 
        set_page_writeback(page);
-       f2fs_submit_page_mbio(&fio);
+       f2fs_submit_page_write(&fio);
 }
 
 void write_node_page(unsigned int nid, struct f2fs_io_info *fio)
@@ -2296,8 +2295,8 @@ void f2fs_wait_on_page_writeback(struct page *page,
        if (PageWriteback(page)) {
                struct f2fs_sb_info *sbi = F2FS_P_SB(page);
 
-               f2fs_submit_merged_bio_cond(sbi, page->mapping->host,
-                                               0, page->index, type, WRITE);
+               f2fs_submit_merged_write_cond(sbi, page->mapping->host,
+                                               0, page->index, type);
                if (ordered)
                        wait_on_page_writeback(page);
                else

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 397b1e8..9059939 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -817,7 +817,7 @@ static void f2fs_put_super(struct super_block *sb)
        mutex_unlock(&sbi->umount_mutex);
 
        /* our cp_error case, we can wait for any writeback page */
-       f2fs_flush_merged_bios(sbi);
+       f2fs_flush_merged_writes(sbi);
 
        iput(sbi->node_inode);
        iput(sbi->meta_inode);
@@ -1966,9 +1966,6 @@ try_onemore:
        set_sbi_flag(sbi, SBI_POR_DOING);
        spin_lock_init(&sbi->stat_lock);
 
-       init_rwsem(&sbi->read_io.io_rwsem);
-       sbi->read_io.sbi = sbi;
-       sbi->read_io.bio = NULL;
        for (i = 0; i < NR_PAGE_TYPE; i++) {
                init_rwsem(&sbi->write_io[i].io_rwsem);
                sbi->write_io[i].sbi = sbi;

diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index 15da88c..5805d92 100644 (file)
--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@@ -790,7 +790,7 @@ DEFINE_EVENT_CONDITION(f2fs__submit_page_bio, f2fs_submit_page_bio,
        TP_CONDITION(page->mapping)
 );
 
-DEFINE_EVENT_CONDITION(f2fs__submit_page_bio, f2fs_submit_page_mbio,
+DEFINE_EVENT_CONDITION(f2fs__submit_page_bio, f2fs_submit_page_write,
 
        TP_PROTO(struct page *page, struct f2fs_io_info *fio),