Commit 91b76f10 authored by Daeho Jeong's avatar Daeho Jeong Committed by Jaegeuk Kim
Browse files

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: default avatarChris Mason <clm@meta.com>
Fixes: e48e16f3 ("f2fs: support non-4KB block size without packed_ssa feature")
Signed-off-by: default avatarDaeho Jeong <daehojeong@google.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 6bb9010f

fs/f2fs/segment.c

+4 −4
Original line number Diff line number Diff line
@@ -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;