f2fs: check the use of macros on block counts and addresses

This patch cleans up the existing and new macros for readability.

Rule is like this.

         ,-----------------------------------------> MAX_BLKADDR -,
         |  ,------------- TOTAL_BLKS ----------------------------,
         |  |                                                     |
         |  ,- seg0_blkaddr   ,----- sit/nat/ssa/main blkaddress  |
block    |  | (SEG0_BLKADDR)  | | | |   (e.g., MAIN_BLKADDR)      |
address  0..x................ a b c d .............................
            |                                                     |
global seg# 0...................... m .............................
            |                       |                             |
            |                       `------- MAIN_SEGS -----------'
            `-------------- TOTAL_SEGS ---------------------------'
                                    |                             |
 seg#                               0..........xx..................

= Note =
 o GET_SEGNO_FROM_SEG0 : blk address -> global segno
 o GET_SEGNO           : blk address -> segno
 o START_BLOCK         : segno -> starting block address

Reviewed-by: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

1 files changed, 3 insertions, 4 deletions

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index e88fcf65aa7f..2a8f4acdb86b 100644
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -193,7 +193,7 @@ static unsigned int check_bg_victims(struct f2fs_sb_info *sbi)
          * selected by background GC before.
          * Those segments guarantee they have small valid blocks.
          */
-        for_each_set_bit(secno, dirty_i->victim_secmap, TOTAL_SECS(sbi)) {
+        for_each_set_bit(secno, dirty_i->victim_secmap, MAIN_SECS(sbi)) {
                 if (sec_usage_check(sbi, secno))
                         continue;
                 clear_bit(secno, dirty_i->victim_secmap);
@@ -281,9 +281,8 @@ static int get_victim_by_default(struct f2fs_sb_info *sbi,
                 unsigned long cost;
                 unsigned int segno;
 
-                segno = find_next_bit(p.dirty_segmap,
-                                                TOTAL_SEGS(sbi), p.offset);
-                if (segno >= TOTAL_SEGS(sbi)) {
+                segno = find_next_bit(p.dirty_segmap, MAIN_SEGS(sbi), p.offset);
+                if (segno >= MAIN_SEGS(sbi)) {
                         if (sbi->last_victim[p.gc_mode]) {
                                 sbi->last_victim[p.gc_mode] = 0;
                                 p.offset = 0;