From 31a3268839c1aa808a5109111ec847b95e1bb114 Mon Sep 17 00:00:00 2001 From: Changman Lee Date: Thu, 27 Nov 2014 16:03:08 +0900 Subject: [PATCH] f2fs: cleanup if-statement of phase in gc_data_segment Little cleanup to distinguish each phase easily Signed-off-by: Changman Lee [Jaegeuk Kim: modify indentation for code readability] Signed-off-by: Jaegeuk Kim --- fs/f2fs/gc.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index 657683c9..6acd5f2 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c @@ -603,27 +603,27 @@ next_step: data_page = find_data_page(inode, start_bidx + ofs_in_node, false); - if (IS_ERR(data_page)) - goto next_iput; + if (IS_ERR(data_page)) { + iput(inode); + continue; + } f2fs_put_page(data_page, 0); add_gc_inode(inode, ilist); - } else { - inode = find_gc_inode(dni.ino, ilist); - if (inode) { - start_bidx = start_bidx_of_node(nofs, - F2FS_I(inode)); - data_page = get_lock_data_page(inode, + continue; + } + + /* phase 3 */ + inode = find_gc_inode(dni.ino, ilist); + 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); - stat_inc_data_blk_count(sbi, 1); - } + if (IS_ERR(data_page)) + continue; + move_data_page(inode, data_page, gc_type); + stat_inc_data_blk_count(sbi, 1); } - continue; -next_iput: - iput(inode); } if (++phase < 4) -- 2.7.4