From: Theodore Ts'o Date: Fri, 7 Jan 2011 21:38:13 +0000 (-0500) Subject: resize2fs: fix computation of the real end of the bitmap to be 64-bit X-Git-Tag: v1.41.90.wc1~7 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=2696f2501c864e0e26e203023907a5441197c92b;p=tools%2Fe2fsprogs.git resize2fs: fix computation of the real end of the bitmap to be 64-bit real_end had been previously declared with a bogus type, which is why this was missed earlier. Signed-off-by: "Theodore Ts'o" --- diff --git a/resize/resize2fs.c b/resize/resize2fs.c index 55e5512..216a626 100644 --- a/resize/resize2fs.c +++ b/resize/resize2fs.c @@ -294,7 +294,7 @@ errcode_t adjust_fs_info(ext2_filsys fs, ext2_filsys old_fs, blk64_t overhead = 0; blk64_t rem; blk64_t blk, group_block; - ext2_ino_t real_end; + blk64_t real_end; blk64_t adj, old_numblocks, numblocks, adjblocks; unsigned long i, j, old_desc_blocks, max_group; unsigned int meta_bg, meta_bg_size; @@ -381,9 +381,9 @@ retry: fs->inode_map); if (retval) goto errout; - real_end = ((EXT2_BLOCKS_PER_GROUP(fs->super) - * fs->group_desc_count)) - 1 + - fs->super->s_first_data_block; + real_end = (((blk64_t) EXT2_BLOCKS_PER_GROUP(fs->super) * + fs->group_desc_count)) - 1 + + fs->super->s_first_data_block; retval = ext2fs_resize_block_bitmap2(ext2fs_blocks_count(fs->super)-1, real_end, fs->block_map);