f2fs: refactor __allocate_new_segment

Simplify the check whether to allocate a new segment or reuse an open
one.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 50af5fcb88e9324a073a464a26571cfe281b5de8..3712752d395afb8313b9d29c11fb9587501047d9 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -2913,16 +2913,12 @@ static void __allocate_new_segment(struct f2fs_sb_info *sbi, int type,
        struct curseg_info *curseg = CURSEG_I(sbi, type);
        unsigned int old_segno;
 
-       if (!curseg->inited)
-               goto alloc;
-
-       if (force || curseg->next_blkoff ||
-               get_valid_blocks(sbi, curseg->segno, new_sec))
-               goto alloc;
-
-       if (!get_ckpt_valid_blocks(sbi, curseg->segno, new_sec))
+       if (!force && curseg->inited &&
+           !curseg->next_blkoff &&
+           !get_valid_blocks(sbi, curseg->segno, new_sec) &&
+           !get_ckpt_valid_blocks(sbi, curseg->segno, new_sec))
                return;
-alloc:
+
        old_segno = curseg->segno;
        new_curseg(sbi, type, true);
        stat_inc_seg_type(sbi, curseg);