f2fs: cleanup if-statement of phase in gc_data_segment
authorChangman Lee <cm224.lee@samsung.com>
Thu, 27 Nov 2014 07:03:08 +0000 (16:03 +0900)
committerJaegeuk Kim <jaegeuk@kernel.org>
Fri, 28 Nov 2014 04:30:17 +0000 (20:30 -0800)
Little cleanup to distinguish each phase easily

Signed-off-by: Changman Lee <cm224.lee@samsung.com>
[Jaegeuk Kim: modify indentation for code readability]
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/gc.c

index 657683c9ee48103cb25d22f70e0c72caee8a0d24..6acd5f2402244ca35d1aa8cd5034bfaf59c42274 100644 (file)
@@ -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)