mirror of
https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git
synced 2025-01-25 09:53:52 +08:00
resize2fs.c: Fix bug where we don't release the blocks belonging
to the old inode table blocks when we move the inode table. (Addresses Debian Bug: #290894)
This commit is contained in:
Theodore Ts'o
parent
7331196a16
commit
64ad98acbe
@ -1,3 +1,9 @@
|
||||
2005-01-26 Theodore Ts'o <tytso@mit.edu>
|
||||
|
||||
* resize2fs.c: Fix bug where we don't release the blocks belonging
|
||||
to the old inode table blocks when we move the inode
|
||||
table. (Addresses Debian Bug: #290894)
|
||||
|
||||
2005-01-05 Theodore Ts'o <tytso@mit.edu>
|
||||
|
||||
* main.c (main): Use parse_num_blocks() from the e2p library to
|
||||
|
||||
@ -126,14 +126,14 @@ errcode_t resize_fs(ext2_filsys fs, blk_t *new_size, int flags,
|
||||
if (retval)
|
||||
goto errout;
|
||||
|
||||
retval = ext2fs_calculate_summary_stats(rfs->new_fs);
|
||||
if (retval)
|
||||
goto errout;
|
||||
|
||||
retval = move_itables(rfs);
|
||||
if (retval)
|
||||
goto errout;
|
||||
|
||||
retval = ext2fs_calculate_summary_stats(rfs->new_fs);
|
||||
if (retval)
|
||||
goto errout;
|
||||
|
||||
retval = fix_resize_inode(rfs->new_fs);
|
||||
if (retval)
|
||||
goto errout;
|
||||
@ -475,7 +475,7 @@ errout:
|
||||
* filesystem meta-data blocks.
|
||||
*/
|
||||
static errcode_t mark_table_blocks(ext2_filsys fs,
|
||||
ext2fs_block_bitmap *ret_bmap)
|
||||
ext2fs_block_bitmap bmap)
|
||||
{
|
||||
blk_t block, b;
|
||||
unsigned int j;
|
||||
@ -483,14 +483,8 @@ static errcode_t mark_table_blocks(ext2_filsys fs,
|
||||
unsigned long meta_bg, meta_bg_size;
|
||||
int has_super;
|
||||
unsigned int old_desc_blocks;
|
||||
ext2fs_block_bitmap bmap;
|
||||
errcode_t retval;
|
||||
|
||||
retval = ext2fs_allocate_block_bitmap(fs, _("meta-data blocks"),
|
||||
&bmap);
|
||||
if (retval)
|
||||
return retval;
|
||||
|
||||
meta_bg_size = (fs->blocksize / sizeof (struct ext2_group_desc));
|
||||
block = fs->super->s_first_data_block;
|
||||
if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)
|
||||
@ -499,35 +493,7 @@ static errcode_t mark_table_blocks(ext2_filsys fs,
|
||||
old_desc_blocks = fs->desc_blocks +
|
||||
fs->super->s_reserved_gdt_blocks;
|
||||
for (i = 0; i < fs->group_desc_count; i++) {
|
||||
has_super = ext2fs_bg_has_super(fs, i);
|
||||
if (has_super)
|
||||
/*
|
||||
* Mark this group's copy of the superblock
|
||||
*/
|
||||
ext2fs_mark_block_bitmap(bmap, block);
|
||||
|
||||
meta_bg = i / meta_bg_size;
|
||||
|
||||
if (!(fs->super->s_feature_incompat &
|
||||
EXT2_FEATURE_INCOMPAT_META_BG) ||
|
||||
(meta_bg < fs->super->s_first_meta_bg)) {
|
||||
if (has_super) {
|
||||
/*
|
||||
* Mark this group's copy of the descriptors
|
||||
*/
|
||||
for (j = 0; j < old_desc_blocks; j++)
|
||||
ext2fs_mark_block_bitmap(bmap,
|
||||
block + j + 1);
|
||||
}
|
||||
} else {
|
||||
if (has_super)
|
||||
has_super = 1;
|
||||
if (((i % meta_bg_size) == 0) ||
|
||||
((i % meta_bg_size) == 1) ||
|
||||
((i % meta_bg_size) == (meta_bg_size-1)))
|
||||
ext2fs_mark_block_bitmap(bmap,
|
||||
block + has_super);
|
||||
}
|
||||
ext2fs_reserve_super_and_bgd(fs, i, bmap);
|
||||
|
||||
/*
|
||||
* Mark the blocks used for the inode table
|
||||
@ -542,6 +508,7 @@ static errcode_t mark_table_blocks(ext2_filsys fs,
|
||||
*/
|
||||
ext2fs_mark_block_bitmap(bmap,
|
||||
fs->group_desc[i].bg_block_bitmap);
|
||||
|
||||
/*
|
||||
* Mark block used for the inode bitmap
|
||||
*/
|
||||
@ -549,7 +516,6 @@ static errcode_t mark_table_blocks(ext2_filsys fs,
|
||||
fs->group_desc[i].bg_inode_bitmap);
|
||||
block += fs->super->s_blocks_per_group;
|
||||
}
|
||||
*ret_bmap = bmap;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -620,7 +586,12 @@ static errcode_t blocks_to_move(ext2_resize_t rfs)
|
||||
if (retval)
|
||||
return retval;
|
||||
|
||||
retval = mark_table_blocks(old_fs, &meta_bmap);
|
||||
retval = ext2fs_allocate_block_bitmap(fs, _("meta-data blocks"),
|
||||
&meta_bmap);
|
||||
if (retval)
|
||||
return retval;
|
||||
|
||||
retval = mark_table_blocks(old_fs, meta_bmap);
|
||||
if (retval)
|
||||
return retval;
|
||||
|
||||
@ -1346,9 +1317,9 @@ static errcode_t move_itables(ext2_resize_t rfs)
|
||||
dgrp_t i, max_groups;
|
||||
ext2_filsys fs = rfs->new_fs;
|
||||
char *cp;
|
||||
blk_t old_blk, new_blk;
|
||||
blk_t old_blk, new_blk, blk;
|
||||
errcode_t retval;
|
||||
int to_move, moved;
|
||||
int j, to_move, moved;
|
||||
|
||||
max_groups = fs->group_desc_count;
|
||||
if (max_groups > rfs->old_fs->group_desc_count)
|
||||
@ -1437,16 +1408,23 @@ static errcode_t move_itables(ext2_resize_t rfs)
|
||||
if (retval)
|
||||
goto errout;
|
||||
}
|
||||
|
||||
for (blk = rfs->old_fs->group_desc[i].bg_inode_table, j=0;
|
||||
j < fs->inode_blocks_per_group ; j++, blk++)
|
||||
ext2fs_unmark_block_bitmap(fs->block_map, blk);
|
||||
|
||||
rfs->old_fs->group_desc[i].bg_inode_table = new_blk;
|
||||
ext2fs_mark_super_dirty(rfs->old_fs);
|
||||
ext2fs_flush(rfs->old_fs);
|
||||
|
||||
if (rfs->progress) {
|
||||
ext2fs_flush(rfs->old_fs);
|
||||
retval = rfs->progress(rfs, E2_RSZ_MOVE_ITABLE_PASS,
|
||||
++moved, to_move);
|
||||
if (retval)
|
||||
goto errout;
|
||||
}
|
||||
}
|
||||
mark_table_blocks(fs, fs->block_map);
|
||||
ext2fs_flush(fs);
|
||||
#ifdef RESIZE2FS_DEBUG
|
||||
if (rfs->flags & RESIZE_DEBUG_ITABLEMOVE)
|
||||
|
||||
2596
tests/r_move_itable/expect
Normal file
2596
tests/r_move_itable/expect
Normal file
File diff suppressed because it is too large
Load Diff
115
tests/r_move_itable/script
Normal file
115
tests/r_move_itable/script
Normal file
@ -0,0 +1,115 @@
|
||||
echo -n "resize2fs with resize_inode: "
|
||||
|
||||
if ! test -x $RESIZE2FS; then
|
||||
rm -f $test_name.ok $test_name.failed
|
||||
echo "skipped"
|
||||
else
|
||||
|
||||
FSCK_OPT=-yf
|
||||
OUT=$test_name.log
|
||||
if [ -f $test_dir/expect.gz ]; then
|
||||
EXP=tmp_expect
|
||||
gunzip < $test_dir/expect.gz > $EXP1
|
||||
else
|
||||
EXP=$test_dir/expect
|
||||
fi
|
||||
|
||||
cp /dev/null $OUT
|
||||
|
||||
dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
|
||||
|
||||
echo mke2fs -q -F -o Linux -b 1024 -g 256 test.img 1024 > $OUT
|
||||
$MKE2FS -q -F -o Linux -b 1024 -g 256 $TMPFILE 1024 2>&1 \
|
||||
| sed -e '1d' | grep -v "automatically checked" |
|
||||
grep -v "whichever comes first" >> $OUT
|
||||
|
||||
echo resize2fs -p test.img 10000 >> $OUT
|
||||
$RESIZE2FS -p $TMPFILE 10000 2>&1 | sed -e '1d' >> $OUT
|
||||
|
||||
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
|
||||
status=$?
|
||||
echo Exit status is $status >> $OUT.new
|
||||
sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT
|
||||
rm -f $OUT.new
|
||||
|
||||
$DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
|
||||
$DEBUGFS -R "set_super_value hash_seed null" -w $TMPFILE >/dev/null 2>&1
|
||||
$DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
|
||||
$TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1
|
||||
|
||||
echo dumpe2fs test.img >> $OUT
|
||||
$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT
|
||||
|
||||
echo "--------------------------------" >> $OUT
|
||||
|
||||
echo resize2fs -p test.img 20000 >> $OUT
|
||||
$RESIZE2FS -p $TMPFILE 20000 2>&1 | sed -e '1d' >> $OUT
|
||||
|
||||
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
|
||||
status=$?
|
||||
echo Exit status is $status >> $OUT.new
|
||||
sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT
|
||||
rm -f $OUT.new
|
||||
|
||||
$DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
|
||||
$DEBUGFS -R "set_super_value hash_seed null" -w $TMPFILE >/dev/null 2>&1
|
||||
$DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
|
||||
$TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1
|
||||
|
||||
echo dumpe2fs test.img >> $OUT
|
||||
$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT
|
||||
|
||||
echo "--------------------------------" >> $OUT
|
||||
|
||||
echo resize2fs -p test.img 30000 >> $OUT
|
||||
$RESIZE2FS -p $TMPFILE 30000 2>&1 | sed -e '1d' >> $OUT
|
||||
|
||||
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
|
||||
status=$?
|
||||
echo Exit status is $status >> $OUT.new
|
||||
sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT
|
||||
rm -f $OUT.new
|
||||
|
||||
$DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
|
||||
$DEBUGFS -R "set_super_value hash_seed null" -w $TMPFILE >/dev/null 2>&1
|
||||
$DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
|
||||
$TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1
|
||||
|
||||
echo dumpe2fs test.img >> $OUT
|
||||
$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT
|
||||
|
||||
echo "--------------------------------" >> $OUT
|
||||
|
||||
echo resize2fs -p test.img 40000 >> $OUT
|
||||
$RESIZE2FS -p $TMPFILE 40000 2>&1 | sed -e '1d' >> $OUT
|
||||
|
||||
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
|
||||
status=$?
|
||||
echo Exit status is $status >> $OUT.new
|
||||
sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT
|
||||
rm -f $OUT.new
|
||||
|
||||
$DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
|
||||
$DEBUGFS -R "set_super_value hash_seed null" -w $TMPFILE >/dev/null 2>&1
|
||||
$DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
|
||||
$TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1
|
||||
|
||||
echo dumpe2fs test.img >> $OUT
|
||||
$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT
|
||||
|
||||
rm -f $test_name.ok $test_name.failed
|
||||
cmp -s $OUT $EXP
|
||||
status=$?
|
||||
|
||||
if [ "$status" = 0 ] ; then
|
||||
echo "ok"
|
||||
touch $test_name.ok
|
||||
else
|
||||
echo "failed"
|
||||
diff -c $EXP $OUT > $test_name.failed
|
||||
rm -f tmp_expect
|
||||
fi
|
||||
|
||||
unset IMAGE FSCK_OPT OUT EXP
|
||||
|
||||
fi #if test -x $RESIZE2FS; then
|
||||
Loading…
Reference in New Issue
Block a user