aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrick J. Wong <darrick.wong@oracle.com>2013-09-09 10:40:36 -0400
committerTheodore Ts'o <tytso@mit.edu>2013-09-09 10:40:48 -0400
commit0851517daa6f11f7bc6b63a82deef7f4561ee3c7 (patch)
treea4d98dfad0afde640b55d3e1b8df1e5f00642cc2
parent816d2c9cf7fb17fe808a081e076cb558f44ec30d (diff)
downloade2fsprogs-0851517daa6f11f7bc6b63a82deef7f4561ee3c7.tar.gz
e2fsprogs-0851517daa6f11f7bc6b63a82deef7f4561ee3c7.tar.xz
e2fsprogs-0851517daa6f11f7bc6b63a82deef7f4561ee3c7.zip
resize2fs: use blk64_t and location getters for free_gdp_blocks()
free_gdp_blocks needs to be taught to use 64-bit fields and the appropriate getters, otherwise it'll truncate high block numbers (when, say, resizing a >16T fs) and mark the low numbered group descriptor blocks as free. Yikes. Reported-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-rw-r--r--resize/resize2fs.c41
1 files changed, 20 insertions, 21 deletions
diff --git a/resize/resize2fs.c b/resize/resize2fs.c
index 204b10af..3b482069 100644
--- a/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@ -273,34 +273,36 @@ static void fix_uninit_block_bitmaps(ext2_filsys fs)
*/
static void free_gdp_blocks(ext2_filsys fs,
ext2fs_block_bitmap reserve_blocks,
- struct ext2_group_desc *gdp)
+ ext2_filsys old_fs,
+ dgrp_t group)
{
- blk_t blk;
+ blk64_t blk;
int j;
- if (gdp->bg_block_bitmap &&
- (gdp->bg_block_bitmap < ext2fs_blocks_count(fs->super))) {
- ext2fs_block_alloc_stats(fs, gdp->bg_block_bitmap, -1);
- ext2fs_mark_block_bitmap2(reserve_blocks,
- gdp->bg_block_bitmap);
+ blk = ext2fs_block_bitmap_loc(old_fs, group);
+ if (blk &&
+ (blk < ext2fs_blocks_count(fs->super))) {
+ ext2fs_block_alloc_stats2(fs, blk, -1);
+ ext2fs_mark_block_bitmap2(reserve_blocks, blk);
}
- if (gdp->bg_inode_bitmap &&
- (gdp->bg_inode_bitmap < ext2fs_blocks_count(fs->super))) {
- ext2fs_block_alloc_stats(fs, gdp->bg_inode_bitmap, -1);
- ext2fs_mark_block_bitmap2(reserve_blocks,
- gdp->bg_inode_bitmap);
+ blk = ext2fs_inode_bitmap_loc(old_fs, group);
+ if (blk &&
+ (blk < ext2fs_blocks_count(fs->super))) {
+ ext2fs_block_alloc_stats2(fs, blk, -1);
+ ext2fs_mark_block_bitmap2(reserve_blocks, blk);
}
- if (gdp->bg_inode_table == 0 ||
- (gdp->bg_inode_table >= ext2fs_blocks_count(fs->super)))
+ blk = ext2fs_inode_table_loc(old_fs, group);
+ if (blk == 0 ||
+ (blk >= ext2fs_blocks_count(fs->super)))
return;
- for (blk = gdp->bg_inode_table, j = 0;
+ for (j = 0;
j < fs->inode_blocks_per_group; j++, blk++) {
if (blk >= ext2fs_blocks_count(fs->super))
break;
- ext2fs_block_alloc_stats(fs, blk, -1);
+ ext2fs_block_alloc_stats2(fs, blk, -1);
ext2fs_mark_block_bitmap2(reserve_blocks, blk);
}
}
@@ -467,11 +469,8 @@ retry:
* and free any blocks associated with their metadata
*/
for (i = fs->group_desc_count;
- i < old_fs->group_desc_count; i++) {
- free_gdp_blocks(fs, reserve_blocks,
- ext2fs_group_desc(old_fs,
- old_fs->group_desc, i));
- }
+ i < old_fs->group_desc_count; i++)
+ free_gdp_blocks(fs, reserve_blocks, old_fs, i);
retval = 0;
goto errout;
}