Since the size of struct f2fs_summary_block equals F2FS_BLKSIZE, use F2FS_BLKSIZE instead of PAGE_CACHE_SIZE as the size of struct f2fs_summary_block.
Signed-off-by: Bart Van Assche <[email protected]> --- fsck/mount.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fsck/mount.c b/fsck/mount.c index cc871fea5d10..584e6d1370ae 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -1854,7 +1854,7 @@ static void read_compacted_summaries(struct f2fs_sb_info *sbi) curseg->sum_blk->entries[j] = *s; offset += SUMMARY_SIZE; if (offset + SUMMARY_SIZE <= - PAGE_CACHE_SIZE - SUM_FOOTER_SIZE) + F2FS_BLKSIZE - SUM_FOOTER_SIZE) continue; memset(kaddr, 0, F2FS_BLKSIZE); ret = dev_read_block(kaddr, start++); @@ -1914,7 +1914,7 @@ static void read_normal_summaries(struct f2fs_sb_info *sbi, int type) blk_addr = GET_SUM_BLKADDR(sbi, segno); } - sum_blk = (struct f2fs_summary_block *)malloc(PAGE_SIZE); + sum_blk = malloc(sizeof(*sum_blk)); ASSERT(sum_blk); ret = dev_read_block(sum_blk, blk_addr); @@ -1924,7 +1924,7 @@ static void read_normal_summaries(struct f2fs_sb_info *sbi, int type) restore_node_summary(sbi, segno, sum_blk); curseg = CURSEG_I(sbi, type); - memcpy(curseg->sum_blk, sum_blk, PAGE_CACHE_SIZE); + memcpy(curseg->sum_blk, sum_blk, sizeof(*sum_blk)); reset_curseg(sbi, type); free(sum_blk); } @@ -1990,7 +1990,7 @@ static int build_curseg(struct f2fs_sb_info *sbi) SM_I(sbi)->curseg_array = array; for (i = 0; i < NR_CURSEG_TYPE; i++) { - array[i].sum_blk = calloc(PAGE_CACHE_SIZE, 1); + array[i].sum_blk = calloc(sizeof(*(array[i].sum_blk)), 1); if (!array[i].sum_blk) { MSG(1, "\tError: Calloc failed for build_curseg!!\n"); goto seg_cleanup; _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
