Merge tag 'f2fs-for-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[linux-2.6-microblaze.git] / fs / f2fs / gc.h

diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h
index 28a0094..9c0d06c 100644 (file)
--- a/fs/f2fs/gc.h
+++ b/fs/f2fs/gc.h
@@ -96,7 +96,7 @@ static inline block_t free_segs_blk_count(struct f2fs_sb_info *sbi)
        if (f2fs_sb_has_blkzoned(sbi))
                return free_segs_blk_count_zoned(sbi);
 
-       return free_segments(sbi) << sbi->log_blocks_per_seg;
+       return SEGS_TO_BLKS(sbi, free_segments(sbi));
 }
 
 static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
@@ -104,7 +104,7 @@ static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
        block_t free_blks, ovp_blks;
 
        free_blks = free_segs_blk_count(sbi);
-       ovp_blks = overprovision_segments(sbi) << sbi->log_blocks_per_seg;
+       ovp_blks = SEGS_TO_BLKS(sbi, overprovision_segments(sbi));
 
        if (free_blks < ovp_blks)
                return 0;