f2fs: clean up unnecessary indentation

No functional change.

Reviewed-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 0465dc00b349d26a6607719e709f5ee0782d2551..5fcb1f92d506f38489335afe25cc9f3178d4a397 100644 (file)
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -429,7 +429,6 @@ static inline void __set_free(struct f2fs_sb_info *sbi, unsigned int segno)
        unsigned int secno = GET_SEC_FROM_SEG(sbi, segno);
        unsigned int start_segno = GET_SEG_FROM_SEC(sbi, secno);
        unsigned int next;
-       unsigned int usable_segs = f2fs_usable_segs_in_sec(sbi);
 
        spin_lock(&free_i->segmap_lock);
        clear_bit(segno, free_i->free_segmap);
@@ -437,7 +436,7 @@ static inline void __set_free(struct f2fs_sb_info *sbi, unsigned int segno)
 
        next = find_next_bit(free_i->free_segmap,
                        start_segno + SEGS_PER_SEC(sbi), start_segno);
-       if (next >= start_segno + usable_segs) {
+       if (next >= start_segno + f2fs_usable_segs_in_sec(sbi)) {
                clear_bit(secno, free_i->free_secmap);
                free_i->free_sections++;
        }
@@ -463,22 +462,31 @@ static inline void __set_test_and_free(struct f2fs_sb_info *sbi,
        unsigned int secno = GET_SEC_FROM_SEG(sbi, segno);
        unsigned int start_segno = GET_SEG_FROM_SEC(sbi, secno);
        unsigned int next;
-       unsigned int usable_segs = f2fs_usable_segs_in_sec(sbi);
+       bool ret;
 
        spin_lock(&free_i->segmap_lock);
-       if (test_and_clear_bit(segno, free_i->free_segmap)) {
-               free_i->free_segments++;
-
-               if (!inmem && IS_CURSEC(sbi, secno))
-                       goto skip_free;
-               next = find_next_bit(free_i->free_segmap,
-                               start_segno + SEGS_PER_SEC(sbi), start_segno);
-               if (next >= start_segno + usable_segs) {
-                       if (test_and_clear_bit(secno, free_i->free_secmap))
-                               free_i->free_sections++;
-               }
-       }
-skip_free:
+       ret = test_and_clear_bit(segno, free_i->free_segmap);
+       if (!ret)
+               goto unlock_out;
+
+       free_i->free_segments++;
+
+       if (!inmem && IS_CURSEC(sbi, secno))
+               goto unlock_out;
+
+       /* check large section */
+       next = find_next_bit(free_i->free_segmap,
+                            start_segno + SEGS_PER_SEC(sbi), start_segno);
+       if (next < start_segno + f2fs_usable_segs_in_sec(sbi))
+               goto unlock_out;
+
+       ret = test_and_clear_bit(secno, free_i->free_secmap);
+       if (!ret)
+               goto unlock_out;
+
+       free_i->free_sections++;
+
+unlock_out:
        spin_unlock(&free_i->segmap_lock);
 }