f2fs: fix incomplete block usage in compact SSA summaries

In a previous commit, a bug was introduced where compact SSA summaries
failed to utilize the entire block space in non-4KB block size
configurations, leading to inefficient space management.

This patch fixes the calculation logic to ensure that compact SSA
summaries can fully occupy the block regardless of the block size.

Reported-by: Chris Mason <clm@meta.com>
Fixes: e48e16f3e37f ("f2fs: support non-4KB block size without packed_ssa feature")
Signed-off-by: Daeho Jeong <daehojeong@google.com>
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 00870a8fe387b627e29bef48a7cf8c554298cf65..6a97fe76712b57d771b228d50d38e42072472c80 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -2674,12 +2674,12 @@ int f2fs_npages_for_summary_flush(struct f2fs_sb_info *sbi, bool for_ra)
                        valid_sum_count += f2fs_curseg_valid_blocks(sbi, i);
        }
 
-       sum_in_page = (sbi->sum_blocksize - 2 * sbi->sum_journal_size -
+       sum_in_page = (sbi->blocksize - 2 * sbi->sum_journal_size -
                        SUM_FOOTER_SIZE) / SUMMARY_SIZE;
        if (valid_sum_count <= sum_in_page)
                return 1;
        else if ((valid_sum_count - sum_in_page) <=
-               (sbi->sum_blocksize - SUM_FOOTER_SIZE) / SUMMARY_SIZE)
+               (sbi->blocksize - SUM_FOOTER_SIZE) / SUMMARY_SIZE)
                return 2;
        return 3;
 }
@@ -4324,7 +4324,7 @@ static int read_compacted_summaries(struct f2fs_sb_info *sbi)
                        s = (struct f2fs_summary *)(kaddr + offset);
                        sum_entries(seg_i->sum_blk)[j] = *s;
                        offset += SUMMARY_SIZE;
-                       if (offset + SUMMARY_SIZE <= sbi->sum_blocksize -
+                       if (offset + SUMMARY_SIZE <= sbi->blocksize -
                                                SUM_FOOTER_SIZE)
                                continue;
 
@@ -4497,7 +4497,7 @@ static void write_compacted_summaries(struct f2fs_sb_info *sbi, block_t blkaddr)
                        *summary = sum_entries(seg_i->sum_blk)[j];
                        written_size += SUMMARY_SIZE;
 
-                       if (written_size + SUMMARY_SIZE <= PAGE_SIZE -
+                       if (written_size + SUMMARY_SIZE <= sbi->blocksize -
                                                        SUM_FOOTER_SIZE)
                                continue;