Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+15 -13
+15 -13
fs/f2fs/gc.c
··· 518 518 return 1; 519 519 } 520 520 521 - static void move_data_page(struct inode *inode, struct page *page, int gc_type) 521 + static void move_data_page(struct inode *inode, block_t bidx, int gc_type) 522 522 { 523 - struct f2fs_io_info fio = { 524 - .sbi = F2FS_I_SB(inode), 525 - .type = DATA, 526 - .rw = WRITE_SYNC, 527 - .page = page, 528 - }; 523 + struct page *page; 524 + 525 + page = get_lock_data_page(inode, bidx); 526 + if (IS_ERR(page)) 527 + return; 529 528 530 529 if (gc_type == BG_GC) { 531 530 if (PageWriteback(page)) ··· 532 533 set_page_dirty(page); 533 534 set_cold_data(page); 534 535 } else { 536 + struct f2fs_io_info fio = { 537 + .sbi = F2FS_I_SB(inode), 538 + .type = DATA, 539 + .rw = WRITE_SYNC, 540 + .page = page, 541 + }; 535 542 f2fs_wait_on_page_writeback(page, DATA); 536 543 537 544 if (clear_page_dirty_for_io(page)) ··· 623 618 /* phase 3 */ 624 619 inode = find_gc_inode(gc_list, dni.ino); 625 620 if (inode) { 626 - start_bidx = start_bidx_of_node(nofs, F2FS_I(inode)); 627 - data_page = get_lock_data_page(inode, 628 - start_bidx + ofs_in_node); 629 - if (IS_ERR(data_page)) 630 - continue; 631 - move_data_page(inode, data_page, gc_type); 621 + start_bidx = start_bidx_of_node(nofs, F2FS_I(inode)) 622 + + ofs_in_node; 623 + move_data_page(inode, start_bidx, gc_type); 632 624 stat_inc_data_blk_count(sbi, 1, gc_type); 633 625 } 634 626 }