From 1d8af189bd3762c09175ff4d9b6cdd98fe8c8150 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Fri, 4 Sep 2009 15:22:39 +0800 Subject: resize2fs: calculate minimal fs size only once When running resize2fs -M, no need to recalculate the minimal fs size. Signed-off-by: "Peng Tao" Signed-off-by: Theodore Ts'o --- resize/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'resize') diff --git a/resize/main.c b/resize/main.c index c6cbb5e8..220c192e 100644 --- a/resize/main.c +++ b/resize/main.c @@ -375,7 +375,7 @@ int main (int argc, char ** argv) exit(1); } if (force_min_size) - new_size = calculate_minimum_resize_size(fs); + new_size = min_size; else if (new_size_str) { new_size = parse_num_blocks(new_size_str, fs->super->s_log_block_size); -- cgit v1.2.3 From 2884d208a37fe8813267198a247694bc90b00f96 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Fri, 4 Sep 2009 17:15:40 +0800 Subject: resize2fs: fix minimum resize size calculation with flex_bg When flex_bg is on, calculate_minimum_resize_size() should add more meta blocks for newly added flex_bg. Addresses-RedHat-Bugzilla: #519131 Signed-off-by: Peng Tao Signed-off-by: Theodore Ts'o --- resize/resize2fs.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'resize') diff --git a/resize/resize2fs.c b/resize/resize2fs.c index c0b00b67..648e1f93 100644 --- a/resize/resize2fs.c +++ b/resize/resize2fs.c @@ -1900,6 +1900,8 @@ blk_t calculate_minimum_resize_size(ext2_filsys fs) blk_t inode_count, blks_needed, groups, data_blocks; blk_t grp, data_needed, last_start; int overhead = 0, num_of_superblocks = 0; + int extra_groups = 0; + int flexbg_size = 1 << fs->super->s_log_groups_per_flex; /* * first figure out how many group descriptors we need to @@ -1934,11 +1936,9 @@ blk_t calculate_minimum_resize_size(ext2_filsys fs) * of inode tables of slack space so the resize * operation can be guaranteed to finish. */ - int flexbg_size = 1 << fs->super->s_log_groups_per_flex; - int extra_groups; - extra_groups = flexbg_size - (groups & (flexbg_size - 1)); data_needed += META_OVERHEAD(fs) * extra_groups; + extra_groups = groups % flexbg_size; } /* @@ -2002,6 +2002,20 @@ blk_t calculate_minimum_resize_size(ext2_filsys fs) } groups += extra_grps; + extra_groups += extra_grps; + if (fs->super->s_feature_incompat + & EXT4_FEATURE_INCOMPAT_FLEX_BG + && extra_groups > flexbg_size) { + /* + * For ext4 we need to allow for up to a flex_bg worth + * of inode tables of slack space so the resize + * operation can be guaranteed to finish. + */ + extra_groups = flexbg_size - + (groups & (flexbg_size - 1)); + data_needed += META_OVERHEAD(fs) * extra_groups; + extra_groups = groups % flexbg_size; + } } /* now for the fun voodoo */ -- cgit v1.2.3