f2fs: use bio op accessors

[deliverable/linux.git] / fs / f2fs / gc.c

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index b0051a97824cca08a835e0524cf733156ded88f0..3649d86bb431e208f5645ed962c5ce9d1bbc817a 100644 (file)
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -96,7 +96,7 @@ int start_gc_thread(struct f2fs_sb_info *sbi)
        dev_t dev = sbi->sb->s_bdev->bd_dev;
        int err = 0;
 
-       gc_th = kmalloc(sizeof(struct f2fs_gc_kthread), GFP_KERNEL);
+       gc_th = f2fs_kmalloc(sizeof(struct f2fs_gc_kthread), GFP_KERNEL);
        if (!gc_th) {
                err = -ENOMEM;
                goto out;
@@ -465,15 +465,7 @@ next_step:
                        continue;
                }
 
-               /* set page dirty and write it */
-               if (gc_type == FG_GC) {
-                       f2fs_wait_on_page_writeback(node_page, NODE, true);
-                       set_page_dirty(node_page);
-               } else {
-                       if (!PageWriteback(node_page))
-                               set_page_dirty(node_page);
-               }
-               f2fs_put_page(node_page, 1);
+               move_node_page(node_page, gc_type);
                stat_inc_node_blk_count(sbi, 1, gc_type);
        }
 
@@ -546,7 +538,8 @@ static void move_encrypted_block(struct inode *inode, block_t bidx)
        struct f2fs_io_info fio = {
                .sbi = F2FS_I_SB(inode),
                .type = DATA,
-               .rw = READ_SYNC,
+               .op = REQ_OP_READ,
+               .op_flags = READ_SYNC,
                .encrypted_page = NULL,
        };
        struct dnode_of_data dn;
@@ -620,7 +613,8 @@ static void move_encrypted_block(struct inode *inode, block_t bidx)
        /* allocate block address */
        f2fs_wait_on_page_writeback(dn.node_page, NODE, true);
 
-       fio.rw = WRITE_SYNC;
+       fio.op = REQ_OP_WRITE;
+       fio.op_flags = WRITE_SYNC;
        fio.new_blkaddr = newaddr;
        f2fs_submit_page_mbio(&fio);
 
@@ -657,7 +651,8 @@ static void move_data_page(struct inode *inode, block_t bidx, int gc_type)
                struct f2fs_io_info fio = {
                        .sbi = F2FS_I_SB(inode),
                        .type = DATA,
-                       .rw = WRITE_SYNC,
+                       .op = REQ_OP_WRITE,
+                       .op_flags = WRITE_SYNC,
                        .page = page,
                        .encrypted_page = NULL,
                };
@@ -834,18 +829,9 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,
                f2fs_put_page(sum_page, 0);
        }
 
-       if (gc_type == FG_GC) {
-               if (type == SUM_TYPE_NODE) {
-                       struct writeback_control wbc = {
-                               .sync_mode = WB_SYNC_ALL,
-                               .nr_to_write = LONG_MAX,
-                               .for_reclaim = 0,
-                       };
-                       sync_node_pages(sbi, 0, &wbc);
-               } else {
-                       f2fs_submit_merged_bio(sbi, DATA, WRITE);
-               }
-       }
+       if (gc_type == FG_GC)
+               f2fs_submit_merged_bio(sbi,
+                               (type == SUM_TYPE_NODE) ? NODE : DATA, WRITE);
 
        blk_finish_plug(&plug);