f2fs: clean up w/ get_left_section_blocks()

Introduce get_left_section_blocks() for cleanup, no logic changes.

Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
index 5e2ee5c686b124824c40b7247b820f97d0fd23ad..1ce2c8abaf48885b6d88bfd1fc708d9fe17e02d1 100644 (file)
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -600,6 +600,16 @@ static inline int reserved_sections(struct f2fs_sb_info *sbi)
        return GET_SEC_FROM_SEG(sbi, reserved_segments(sbi));
 }
 
+static inline unsigned int get_left_section_blocks(struct f2fs_sb_info *sbi,
+                                       enum log_type type, unsigned int segno)
+{
+       if (f2fs_lfs_mode(sbi) && __is_large_section(sbi))
+               return CAP_BLKS_PER_SEC(sbi) - SEGS_TO_BLKS(sbi,
+                       (segno - GET_START_SEG_FROM_SEC(sbi, segno))) -
+                       CURSEG_I(sbi, type)->next_blkoff;
+       return CAP_BLKS_PER_SEC(sbi) - get_ckpt_valid_blocks(sbi, segno, true);
+}
+
 static inline bool has_curseg_enough_space(struct f2fs_sb_info *sbi,
                        unsigned int node_blocks, unsigned int data_blocks,
                        unsigned int dent_blocks)
@@ -614,14 +624,7 @@ static inline bool has_curseg_enough_space(struct f2fs_sb_info *sbi,
                if (unlikely(segno == NULL_SEGNO))
                        return false;
 
-               if (f2fs_lfs_mode(sbi) && __is_large_section(sbi)) {
-                       left_blocks = CAP_BLKS_PER_SEC(sbi) -
-                               SEGS_TO_BLKS(sbi, (segno - GET_START_SEG_FROM_SEC(sbi, segno))) -
-                               CURSEG_I(sbi, i)->next_blkoff;
-               } else {
-                       left_blocks = CAP_BLKS_PER_SEC(sbi) -
-                                       get_ckpt_valid_blocks(sbi, segno, true);
-               }
+               left_blocks = get_left_section_blocks(sbi, i, segno);
 
                blocks = i <= CURSEG_COLD_DATA ? data_blocks : node_blocks;
                if (blocks > left_blocks)
@@ -634,14 +637,7 @@ static inline bool has_curseg_enough_space(struct f2fs_sb_info *sbi,
        if (unlikely(segno == NULL_SEGNO))
                return false;
 
-       if (f2fs_lfs_mode(sbi) && __is_large_section(sbi)) {
-               left_blocks = CAP_BLKS_PER_SEC(sbi) -
-                               SEGS_TO_BLKS(sbi, (segno - GET_START_SEG_FROM_SEC(sbi, segno))) -
-                               CURSEG_I(sbi, CURSEG_HOT_DATA)->next_blkoff;
-       } else {
-               left_blocks = CAP_BLKS_PER_SEC(sbi) -
-                               get_ckpt_valid_blocks(sbi, segno, true);
-       }
+       left_blocks = get_left_section_blocks(sbi, CURSEG_HOT_DATA, segno);
 
        if (dent_blocks > left_blocks)
                return false;