diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2015-04-24 23:34:30 +0200 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2015-05-29 00:41:33 +0200 |
| commit | c879f90da96c6369080be868162ef96aeef4a439 (patch) | |
| tree | fd92e1e26c21026298602d6cafdd1adf14e4d3dc /fs/f2fs/gc.c | |
| parent | f2fs: add sbi and page pointer in f2fs_io_info (diff) | |
| download | linux-c879f90da96c6369080be868162ef96aeef4a439.tar.xz linux-c879f90da96c6369080be868162ef96aeef4a439.zip | |
f2fs: move get_page for gc victims
This patch moves getting victim page into move_data_page.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/gc.c')
| -rw-r--r-- | fs/f2fs/gc.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index 72667a54ac5f..1bd11f017a23 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c @@ -518,14 +518,13 @@ static int check_dnode(struct f2fs_sb_info *sbi, struct f2fs_summary *sum, return 1; } -static void move_data_page(struct inode *inode, struct page *page, int gc_type) +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, - .page = page, - }; + struct page *page; + + page = get_lock_data_page(inode, bidx); + if (IS_ERR(page)) + return; if (gc_type == BG_GC) { if (PageWriteback(page)) @@ -533,6 +532,12 @@ static void move_data_page(struct inode *inode, struct page *page, int gc_type) set_page_dirty(page); set_cold_data(page); } else { + struct f2fs_io_info fio = { + .sbi = F2FS_I_SB(inode), + .type = DATA, + .rw = WRITE_SYNC, + .page = page, + }; f2fs_wait_on_page_writeback(page, DATA); if (clear_page_dirty_for_io(page)) @@ -618,12 +623,9 @@ next_step: /* phase 3 */ inode = find_gc_inode(gc_list, dni.ino); if (inode) { - start_bidx = start_bidx_of_node(nofs, F2FS_I(inode)); - data_page = get_lock_data_page(inode, - start_bidx + ofs_in_node); - if (IS_ERR(data_page)) - continue; - move_data_page(inode, data_page, gc_type); + start_bidx = start_bidx_of_node(nofs, F2FS_I(inode)) + + ofs_in_node; + move_data_page(inode, start_bidx, gc_type); stat_inc_data_blk_count(sbi, 1, gc_type); } } |