Merge tag 'sound-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[firefly-linux-kernel-4.4.55.git] / fs / f2fs / debug.c

diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
index fecebdbfd7810fbccf61c984c9e029c345b7fdef..0a91ab813a9e035781a5bc0efa3b9861746ffdea 100644 (file)
--- a/fs/f2fs/debug.c
+++ b/fs/f2fs/debug.c
@@ -93,7 +93,7 @@ static void update_sit_info(struct f2fs_sb_info *sbi)
        total_vblocks = 0;
        blks_per_sec = sbi->segs_per_sec * (1 << sbi->log_blocks_per_seg);
        hblks_per_sec = blks_per_sec / 2;
-       for (segno = 0; segno < TOTAL_SEGS(sbi); segno += sbi->segs_per_sec) {
+       for (segno = 0; segno < MAIN_SEGS(sbi); segno += sbi->segs_per_sec) {
                vblocks = get_valid_blocks(sbi, segno, sbi->segs_per_sec);
                dist = abs(vblocks - hblks_per_sec);
                bimodal += dist * dist;
@@ -103,7 +103,7 @@ static void update_sit_info(struct f2fs_sb_info *sbi)
                        ndirty++;
                }
        }
-       dist = TOTAL_SECS(sbi) * hblks_per_sec * hblks_per_sec / 100;
+       dist = MAIN_SECS(sbi) * hblks_per_sec * hblks_per_sec / 100;
        si->bimodal = bimodal / dist;
        if (si->dirty_count)
                si->avg_vblocks = total_vblocks / ndirty;
@@ -131,17 +131,17 @@ static void update_mem_info(struct f2fs_sb_info *sbi)
 
        /* build sit */
        si->base_mem += sizeof(struct sit_info);
-       si->base_mem += TOTAL_SEGS(sbi) * sizeof(struct seg_entry);
-       si->base_mem += f2fs_bitmap_size(TOTAL_SEGS(sbi));
-       si->base_mem += 2 * SIT_VBLOCK_MAP_SIZE * TOTAL_SEGS(sbi);
+       si->base_mem += MAIN_SEGS(sbi) * sizeof(struct seg_entry);
+       si->base_mem += f2fs_bitmap_size(MAIN_SEGS(sbi));
+       si->base_mem += 2 * SIT_VBLOCK_MAP_SIZE * MAIN_SEGS(sbi);
        if (sbi->segs_per_sec > 1)
-               si->base_mem += TOTAL_SECS(sbi) * sizeof(struct sec_entry);
+               si->base_mem += MAIN_SECS(sbi) * sizeof(struct sec_entry);
        si->base_mem += __bitmap_size(sbi, SIT_BITMAP);
 
        /* build free segmap */
        si->base_mem += sizeof(struct free_segmap_info);
-       si->base_mem += f2fs_bitmap_size(TOTAL_SEGS(sbi));
-       si->base_mem += f2fs_bitmap_size(TOTAL_SECS(sbi));
+       si->base_mem += f2fs_bitmap_size(MAIN_SEGS(sbi));
+       si->base_mem += f2fs_bitmap_size(MAIN_SECS(sbi));
 
        /* build curseg */
        si->base_mem += sizeof(struct curseg_info) * NR_CURSEG_TYPE;
@@ -149,8 +149,8 @@ static void update_mem_info(struct f2fs_sb_info *sbi)
 
        /* build dirty segmap */
        si->base_mem += sizeof(struct dirty_seglist_info);
-       si->base_mem += NR_DIRTY_TYPE * f2fs_bitmap_size(TOTAL_SEGS(sbi));
-       si->base_mem += f2fs_bitmap_size(TOTAL_SECS(sbi));
+       si->base_mem += NR_DIRTY_TYPE * f2fs_bitmap_size(MAIN_SEGS(sbi));
+       si->base_mem += f2fs_bitmap_size(MAIN_SECS(sbi));
 
        /* build nm */
        si->base_mem += sizeof(struct f2fs_nm_info);