diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2010-02-10 18:20:58 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2010-02-10 18:20:58 -0500 |
| commit | cc84d866e2f29d92b5a732fead4df2dd9f814f2b (patch) | |
| tree | a6df81da507c60d8253b436cf694ba03b6c9ee52 /resize | |
| parent | 3067d96a2d226e2d1b6c97501be6aaa8e85140c3 (diff) | |
| parent | 9080695a4ec602b1102d836b44b18c2ec692c12e (diff) | |
| download | e2fsprogs-cc84d866e2f29d92b5a732fead4df2dd9f814f2b.tar.gz | |
Merge branch 'maint' into next
Conflicts:
e2fsck/pass1.c
Diffstat (limited to 'resize')
| -rw-r--r-- | resize/resize2fs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/resize/resize2fs.c b/resize/resize2fs.c index 19844429..818b7b7b 100644 --- a/resize/resize2fs.c +++ b/resize/resize2fs.c @@ -1819,6 +1819,8 @@ static errcode_t ext2fs_calculate_summary_stats(ext2_filsys fs) ext2fs_bg_free_blocks_count_set(fs, group, group_free); ext2fs_group_desc_csum_set(fs, group); group++; + if (group >= fs->group_desc_count) + break; count = 0; group_free = 0; uninit = (ext2fs_bg_flags_test(fs, group, EXT2_BG_BLOCK_UNINIT) @@ -1858,6 +1860,8 @@ static errcode_t ext2fs_calculate_summary_stats(ext2_filsys fs) ext2fs_bg_free_inodes_count_set(fs, group, group_free); ext2fs_group_desc_csum_set(fs, group); group++; + if (group >= fs->group_desc_count) + break; count = 0; group_free = 0; uninit = ext2fs_bg_flags_test(fs, group, EXT2_BG_INODE_UNINIT); |