Message-Id: <1440606156-5754-22-git-send-email-jack@suse.com>
Date:	Wed, 26 Aug 2015 18:22:36 +0200
From:	Jan Kara <jack@...e.com>
To:	linux-ext4@...r.kernel.org
Cc:	Ted Tso <tytso@....edu>,
	"Darrick J. Wong" <darrick.wong@...cle.com>,
	Jan Kara <jack@...e.com>
Subject: [PATCH 21/21] resize2fs: Use libextfs2 helpers for resizing

Change resize2fs to use ext2fs_move_blocks() and ext2fs_move_inodes() to
do resizing and thus avoid unnecessary code duplication. This results in
a quite big rewrite of the resize code but hopefully the result is
worth it.

Since location of some group metadata changes in some tests, update the
expected outputs.

Signed-off-by: Jan Kara <jack@...e.com>
---
 resize/online.c                      |   14 +-
 resize/resize2fs.c                   | 2323 ++++++++--------------------------
 resize/resize2fs.h                   |   15 +-
 tests/r_expand_full/expect           |   20 +-
 tests/t_32to64bit_expand_full/expect |   20 +-
 5 files changed, 578 insertions(+), 1814 deletions(-)

diff --git a/resize/online.c b/resize/online.c
index 46d86b0f3c8d..d202c0e92e6e 100644
--- a/resize/online.c
+++ b/resize/online.c
@@ -197,6 +197,12 @@ errcode_t online_resize_fs(ext2_filsys fs, const char *mtpt,
 		return retval;
 	}
 
+	retval = validate_fs_size(fs, new_size);
+	if (retval) {
+		close(fd);
+		return retval;
+	}
+
 	retval = ext2fs_dup_handle(fs, &new_fs);
 	if (retval) {
 		close(fd);
@@ -214,7 +220,13 @@ errcode_t online_resize_fs(ext2_filsys fs, const char *mtpt,
 	 * but at least it allows on-line resizing to function.
 	 */
 	new_fs->super->s_feature_incompat &= ~EXT4_FEATURE_INCOMPAT_FLEX_BG;
-	retval = adjust_fs_info(new_fs, fs, 0, *new_size);
+	retval = adjust_fs_info(new_fs, fs, *new_size);
+	if (retval) {
+		close(fd);
+		return retval;
+	}
+
+	retval = alloc_new_groups(new_fs, fs->group_desc_count);
 	if (retval) {
 		close(fd);
 		return retval;
diff --git a/resize/resize2fs.c b/resize/resize2fs.c
index 70c963783f3f..51f013e4be64 100644
--- a/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@ -13,24 +13,36 @@
  */
 
 /*
- * Resizing a filesystem consists of the following phases:
+ * Shrinking a filesystem consists of the following phases:
  *
- *	1.  Adjust superblock and write out new parts of the inode
- * 		table
- * 	2.  Determine blocks which need to be relocated, and copy the
- * 		contents of blocks from their old locations to the new ones.
- * 	3.  Scan the inode table, doing the following:
- * 		a.  If blocks have been moved, update the block
- * 			pointers in the inodes and indirect blocks to
- * 			point at the new block locations.
- * 		b.  If parts of the inode table need to be evacuated,
- * 			copy inodes from their old locations to their
- * 			new ones.
- * 		c.  If (b) needs to be done, note which blocks contain
- * 			directory information, since we will need to
- * 			update the directory information.
- * 	4.  Update the directory blocks with the new inode locations.
- * 	5.  Move the inode tables, if necessary.
+ *	1. We validate whether filesystem size is sane
+ *	2. We identify blocks which need moving (beyond new end of the
+ *	   filesystem, under new sb backup if sparse_super2 is enabled) and
+ *	   move them. ext2fs_move_blocks() also takes care of updating all the
+ *	   block references.
+ *	3. We identify inodes which need moving (beyond end of the new
+ *	   filesystem) and move them. ext2fs_move_inodes() also takes care of
+ *	   updating all the inode references.
+ *	4. We create new fs structure with updated number of block groups.
+ *	5. We free metadata of groups that will be removed (with flex_bg
+ *	   feature they can be allocated inside area of the new filesystem).
+ *	6. We free backup group descriptor blocks which are not needed anymore.
+ *	7. We recompute group & global allocation counters.
+ *	8. We rewrite resize inode to contain now reserved blocks for backup
+ *	   group descriptors.
+ *
+ * Growing a filesystem consists of the following phases:
+ *	1. We validate whether filesystem size is sane
+ *	2. We create new fs structure with updated number of block groups.
+ *	3. We allocate and initialize bitmaps & inode tables for new groups.
+ *	4. We identify blocks that need moving to make space for new group
+ *	   descriptor backups and move them. ext2fs_move_blocks() also takes
+ *	   care of updating all the block references.
+ *	5. We free space of group descriptor backups that aren't needed anymore
+ *	   (happens with sparse_super2 feature).
+ *	6. We recompute group & global allocation counters.
+ *	7. We rewrite resize inode to contain now reserved blocks for backup
+ *	   group descriptors.
  */
 
 #include "config.h"
@@ -41,21 +53,17 @@
 #define RESIZE2FS_DEBUG
 #endif
 
-static void fix_uninit_block_bitmaps(ext2_filsys fs);
-static errcode_t adjust_superblock(ext2_resize_t rfs, blk64_t new_size);
-static errcode_t blocks_to_move(ext2_resize_t rfs);
-static errcode_t block_mover(ext2_resize_t rfs);
-static errcode_t inode_scan_and_fix(ext2_resize_t rfs);
-static errcode_t inode_ref_fix(ext2_resize_t rfs);
-static errcode_t move_itables(ext2_resize_t rfs);
+static void fix_uninit_block_bitmaps(ext2_filsys fs, dgrp_t start);
 static errcode_t fix_resize_inode(ext2_filsys fs);
 static errcode_t ext2fs_calculate_summary_stats(ext2_filsys fs);
-static errcode_t fix_sb_journal_backup(ext2_filsys fs);
 static errcode_t mark_table_blocks(ext2_filsys fs,
 				   ext2fs_block_bitmap bmap);
 static errcode_t clear_sparse_super2_last_group(ext2_resize_t rfs);
-static errcode_t reserve_sparse_super2_last_group(ext2_resize_t rfs,
-						 ext2fs_block_bitmap meta_bmap);
+static errcode_t free_group_metadata(ext2_resize_t rfs);
+static errcode_t prepare_shrink(ext2_filsys fs, blk64_t new_size);
+static errcode_t init_new_itables(ext2_resize_t rfs);
+static errcode_t free_gd_blocks(ext2_resize_t rfs);
+static errcode_t make_space_for_gd(ext2_resize_t rfs);
 
 /*
  * Some helper CPP macros
@@ -101,7 +109,6 @@ errcode_t resize_fs(ext2_filsys fs, blk64_t *new_size, int flags,
 	fs->priv_data = rfs;
 	rfs->old_fs = fs;
 	rfs->flags = flags;
-	rfs->itable_buf	 = 0;
 	rfs->progress = progress;
 
 	init_resource_track(&overall_track, "overall resize2fs", fs->io);
@@ -116,64 +123,76 @@ errcode_t resize_fs(ext2_filsys fs, blk64_t *new_size, int flags,
 	ext2fs_flush(fs);
 
 	init_resource_track(&rtrack, "fix_uninit_block_bitmaps 1", fs->io);
-	fix_uninit_block_bitmaps(fs);
+	fix_uninit_block_bitmaps(fs, 0);
 	print_resource_track(rfs, &rtrack, fs->io);
-	retval = ext2fs_dup_handle(fs, &rfs->new_fs);
-	if (retval)
-		goto errout;
 
-	init_resource_track(&rtrack, "adjust_superblock", fs->io);
-	retval = adjust_superblock(rfs, *new_size);
+	retval = validate_fs_size(fs, new_size);
 	if (retval)
 		goto errout;
-	print_resource_track(rfs, &rtrack, fs->io);
-
-	init_resource_track(&rtrack, "fix_uninit_block_bitmaps 2", fs->io);
-	fix_uninit_block_bitmaps(rfs->new_fs);
-	print_resource_track(rfs, &rtrack, fs->io);
-	/* Clear the block bitmap uninit flag for the last block group */
-	ext2fs_bg_flags_clear(rfs->new_fs, rfs->new_fs->group_desc_count - 1,
-			     EXT2_BG_BLOCK_UNINIT);
 
-	*new_size = ext2fs_blocks_count(rfs->new_fs->super);
+	if (*new_size < ext2fs_blocks_count(fs->super)) {
+		init_resource_track(&rtrack, "prepare_shrink", fs->io);
+		retval = prepare_shrink(fs, *new_size);
+		if (retval)
+			goto errout;
+		print_resource_track(rfs, &rtrack, fs->io);
+	}
 
-	init_resource_track(&rtrack, "blocks_to_move", fs->io);
-	retval = blocks_to_move(rfs);
+	retval = ext2fs_dup_handle(fs, &rfs->new_fs);
 	if (retval)
 		goto errout;
-	print_resource_track(rfs, &rtrack, fs->io);
-
-#ifdef RESIZE2FS_DEBUG
-	if (rfs->flags & RESIZE_DEBUG_BMOVE)
-		printf("Number of free blocks: %llu/%llu, Needed: %llu\n",
-		       ext2fs_free_blocks_count(rfs->old_fs->super),
-		       ext2fs_free_blocks_count(rfs->new_fs->super),
-		       rfs->needed_blocks);
-#endif
 
-	init_resource_track(&rtrack, "block_mover", fs->io);
-	retval = block_mover(rfs);
+	init_resource_track(&rtrack, "adjust_fs_info", fs->io);
+	retval = adjust_fs_info(rfs->new_fs, fs, *new_size);
 	if (retval)
 		goto errout;
 	print_resource_track(rfs, &rtrack, fs->io);
 
-	init_resource_track(&rtrack, "inode_scan_and_fix", fs->io);
-	retval = inode_scan_and_fix(rfs);
-	if (retval)
-		goto errout;
-	print_resource_track(rfs, &rtrack, fs->io);
+	if (*new_size > ext2fs_blocks_count(fs->super)) {
+		retval = alloc_new_groups(rfs->new_fs,
+					  rfs->old_fs->group_desc_count);
+		if (retval)
+			goto errout;
 
-	init_resource_track(&rtrack, "inode_ref_fix", fs->io);
-	retval = inode_ref_fix(rfs);
-	if (retval)
-		goto errout;
-	print_resource_track(rfs, &rtrack, fs->io);
+		retval = init_new_itables(rfs);
+		if (retval)
+			goto errout;
 
-	init_resource_track(&rtrack, "move_itables", fs->io);
-	retval = move_itables(rfs);
-	if (retval)
-		goto errout;
-	print_resource_track(rfs, &rtrack, fs->io);
+		init_resource_track(&rtrack, "fix_uninit_block_bitmaps 2",
+				    fs->io);
+		fix_uninit_block_bitmaps(rfs->new_fs, fs->group_desc_count);
+		print_resource_track(rfs, &rtrack, fs->io);
+	}
+
+	/* Clear the block bitmap uninit flag for the last block group */
+	ext2fs_bg_flags_clear(rfs->new_fs, rfs->new_fs->group_desc_count - 1,
+			     EXT2_BG_BLOCK_UNINIT);
+
+	if (*new_size > ext2fs_blocks_count(fs->super)) {
+		init_resource_track(&rtrack, "make_space_for_gd", fs->io);
+		retval = make_space_for_gd(rfs);
+		if (retval)
+			goto errout;
+		print_resource_track(rfs, &rtrack, fs->io);
+
+		retval = clear_sparse_super2_last_group(rfs);
+		if (retval)
+			goto errout;
+	} else {
+		init_resource_track(&rtrack, "free_group_metadata", fs->io);
+		/* Now free metadata of groups we don't need anymore */
+		retval = free_group_metadata(rfs);
+		if (retval)
+			goto errout;
+		print_resource_track(rfs, &rtrack, fs->io);
+
+		init_resource_track(&rtrack, "free_gd_blocks", fs->io);
+		/* Free backup group descriptors we don't need */
+		retval = free_gd_blocks(rfs);
+		if (retval)
+			goto errout;
+		print_resource_track(rfs, &rtrack, fs->io);
+	}
 
 	init_resource_track(&rtrack, "calculate_summary_stats", fs->io);
 	retval = ext2fs_calculate_summary_stats(rfs->new_fs);
@@ -187,22 +206,15 @@ errcode_t resize_fs(ext2_filsys fs, blk64_t *new_size, int flags,
 		goto errout;
 	print_resource_track(rfs, &rtrack, fs->io);
 
-	init_resource_track(&rtrack, "fix_sb_journal_backup", fs->io);
-	retval = fix_sb_journal_backup(rfs->new_fs);
-	if (retval)
-		goto errout;
-	print_resource_track(rfs, &rtrack, fs->io);
-
-	retval = clear_sparse_super2_last_group(rfs);
-	if (retval)
-		goto errout;
-
 	retval = ext2fs_set_gdt_csum(rfs->new_fs);
 	if (retval)
 		goto errout;
 
 	rfs->new_fs->super->s_state &= ~EXT2_ERROR_FS;
 	rfs->new_fs->flags &= ~EXT2_FLAG_MASTER_SB_ONLY;
+	ext2fs_mark_bb_dirty(rfs->new_fs);
+	ext2fs_mark_ib_dirty(rfs->new_fs);
+	ext2fs_mark_super_dirty(rfs->new_fs);
 
 	print_resource_track(rfs, &overall_track, fs->io);
 	retval = ext2fs_close_free(&rfs->new_fs);
@@ -213,12 +225,6 @@ errcode_t resize_fs(ext2_filsys fs, blk64_t *new_size, int flags,
 
 	ext2fs_free(rfs->old_fs);
 	rfs->old_fs = NULL;
-	if (rfs->itable_buf)
-		ext2fs_free_mem(&rfs->itable_buf);
-	if (rfs->reserve_blocks)
-		ext2fs_free_block_bitmap(rfs->reserve_blocks);
-	if (rfs->move_blocks)
-		ext2fs_free_block_bitmap(rfs->move_blocks);
 	ext2fs_free_mem(&rfs);
 
 	return 0;
@@ -228,8 +234,6 @@ errout:
 		ext2fs_free(rfs->new_fs);
 		rfs->new_fs = NULL;
 	}
-	if (rfs->itable_buf)
-		ext2fs_free_mem(&rfs->itable_buf);
 	ext2fs_free_mem(&rfs);
 	return retval;
 }
@@ -255,16 +259,15 @@ static void adjust_reserved_gdt_blocks(ext2_filsys old_fs, ext2_filsys fs)
 /*
  * Clean up the bitmaps for unitialized bitmaps
  */
-static void fix_uninit_block_bitmaps(ext2_filsys fs)
+static void fix_uninit_block_bitmaps(ext2_filsys fs, dgrp_t start)
 {
 	blk64_t		blk, lblk;
 	dgrp_t		g;
-	int		i;
 
 	if (!ext2fs_has_group_desc_csum(fs))
 		return;
 
-	for (g=0; g < fs->group_desc_count; g++) {
+	for (g = start; g < fs->group_desc_count; g++) {
 		if (!(ext2fs_bg_flags_test(fs, g, EXT2_BG_BLOCK_UNINIT)))
 			continue;
 
@@ -278,10 +281,9 @@ static void fix_uninit_block_bitmaps(ext2_filsys fs)
 					  ext2fs_block_bitmap_loc(fs, g));
 		ext2fs_mark_block_bitmap2(fs->block_map,
 					  ext2fs_inode_bitmap_loc(fs, g));
-		for (i = 0, blk = ext2fs_inode_table_loc(fs, g);
-		     i < (unsigned int) fs->inode_blocks_per_group;
-		     i++, blk++)
-			ext2fs_mark_block_bitmap2(fs->block_map, blk);
+		ext2fs_mark_block_bitmap_range2(fs->block_map,
+						ext2fs_inode_table_loc(fs, g),
+						fs->inode_blocks_per_group);
 	}
 }
 
@@ -297,21 +299,73 @@ static void fix_uninit_block_bitmaps(ext2_filsys fs)
  */
 
 /*
- * If the group descriptor's bitmap and inode table blocks are valid,
- * release them in the new filesystem data structure, and mark them as
- * reserved so the old inode table blocks don't get overwritten.
+ * Check whether requested filesystem size is sane. Round it down in case the
+ * last group would be too small.
+ */
+errcode_t validate_fs_size(ext2_filsys fs, blk64_t *new_sizep)
+{
+	blk64_t	new_size = *new_sizep;
+	dgrp_t	groups;
+	blk64_t	desc_blocks;
+	blk64_t	overhead = 0, rem;
+	unsigned long long new_inodes;	/* u64 to check for overflow */
+
+retry:
+	groups = ext2fs_div64_ceil(new_size - fs->super->s_first_data_block,
+				   EXT2_BLOCKS_PER_GROUP(fs->super));
+	if (groups == 0)
+		return EXT2_ET_TOOSMALL;
+	desc_blocks = ext2fs_div_ceil(groups, EXT2_DESC_PER_BLOCK(fs->super));
+
+	/*
+	 * Overhead is the number of bookkeeping blocks per group.  It
+	 * includes the superblock backup, the group descriptor
+	 * backups, the inode bitmap, the block bitmap, and the inode
+	 * table.
+	 */
+	overhead = 2 + fs->inode_blocks_per_group;
+	if (ext2fs_bg_has_super(fs, groups - 1))
+		overhead += 1 + desc_blocks + fs->super->s_reserved_gdt_blocks;
+
+	/*
+	 * See if the last group is big enough to support the
+	 * necessary data structures.  If not, we need to get rid of
+	 * it.
+	 */
+	rem = (new_size - fs->super->s_first_data_block) %
+		fs->super->s_blocks_per_group;
+	if (groups == 1 && rem && rem < overhead)
+		return EXT2_ET_TOOSMALL;
+	if (groups > 1 && rem && rem < overhead + 50) {
+		new_size -= rem;
+		goto retry;
+	}
+
+	new_inodes = ((unsigned long long)fs->super->s_inodes_per_group) *
+									groups;
+	if (new_inodes > ~0U) {
+		fprintf(stderr, _("inodes (%llu) must be less than %u"),
+				   new_inodes, ~0U);
+		return EXT2_ET_TOO_MANY_INODES;
+	}
+
+	*new_sizep = new_size;
+	return 0;
+}
+
+/*
+ * If the group descriptor's bitmap and inode table blocks are valid, release
+ * them. With FLEX_BG this may actually free some space in the shrunk
+ * filesystem.
  */
-static errcode_t free_gdp_blocks(ext2_filsys fs,
-				 ext2fs_block_bitmap reserve_blocks,
-				 ext2_filsys old_fs,
-				 dgrp_t group)
+static errcode_t free_group_metadata(ext2_resize_t rfs)
 {
+	ext2_filsys fs = rfs->new_fs, old_fs = rfs->old_fs;
 	blk64_t	blk;
 	int	j;
 	dgrp_t	i;
 	ext2fs_block_bitmap bg_map = NULL;
 	errcode_t retval = 0;
-	dgrp_t count = old_fs->group_desc_count - fs->group_desc_count;
 
 	/* If bigalloc, don't free metadata living in the same cluster */
 	if (EXT2FS_CLUSTER_RATIO(fs) > 1) {
@@ -324,22 +378,18 @@ static errcode_t free_gdp_blocks(ext2_filsys fs,
 			goto out;
 	}
 
-	for (i = group; i < group + count; i++) {
+	for (i = fs->group_desc_count; i < old_fs->group_desc_count; i++) {
 		blk = ext2fs_block_bitmap_loc(old_fs, i);
 		if (blk &&
 		    (blk < ext2fs_blocks_count(fs->super)) &&
-		    !(bg_map && ext2fs_test_block_bitmap2(bg_map, blk))) {
+		    !(bg_map && ext2fs_test_block_bitmap2(bg_map, blk)))
 			ext2fs_block_alloc_stats2(fs, blk, -1);
-			ext2fs_mark_block_bitmap2(reserve_blocks, blk);
-		}
 
 		blk = ext2fs_inode_bitmap_loc(old_fs, i);
 		if (blk &&
 		    (blk < ext2fs_blocks_count(fs->super)) &&
-		    !(bg_map && ext2fs_test_block_bitmap2(bg_map, blk))) {
+		    !(bg_map && ext2fs_test_block_bitmap2(bg_map, blk)))
 			ext2fs_block_alloc_stats2(fs, blk, -1);
-			ext2fs_mark_block_bitmap2(reserve_blocks, blk);
-		}
 
 		blk = ext2fs_inode_table_loc(old_fs, i);
 		for (j = 0;
@@ -348,7 +398,6 @@ static errcode_t free_gdp_blocks(ext2_filsys fs,
 			    (bg_map && ext2fs_test_block_bitmap2(bg_map, blk)))
 				continue;
 			ext2fs_block_alloc_stats2(fs, blk, -1);
-			ext2fs_mark_block_bitmap2(reserve_blocks, blk);
 		}
 	}
 
@@ -359,250 +408,180 @@ out:
 }
 
 /*
- * This routine is shared by the online and offline resize routines.
- * All of the information which is adjusted in memory is done here.
+ * Prepare filesystem for shrinking - free up all space beyond new end of the
+ * filesystem and space needed for new group descriptor backups. Also move
+ * inodes that are in removed block groups into block groups that remain.
  */
-errcode_t adjust_fs_info(ext2_filsys fs, ext2_filsys old_fs,
-			 ext2fs_block_bitmap reserve_blocks, blk64_t new_size)
+static errcode_t prepare_shrink(ext2_filsys fs, blk64_t new_size)
 {
+	dgrp_t		groups, i;
+	blk64_t		blk;
+	blk64_t		blk_per_g = EXT2_BLOCKS_PER_GROUP(fs->super);
+	ext2fs_inode_bitmap move_inodes = NULL;
+	ext2fs_block_bitmap move_blocks = NULL;
+	ext2_ino_t	old_inos, new_inos, ino;
 	errcode_t	retval;
-	blk64_t		overhead = 0;
-	blk64_t		rem;
-	blk64_t		blk, group_block;
-	blk64_t		real_end;
-	blk64_t		old_numblocks, numblocks, adjblocks;
-	unsigned long	i, j, old_desc_blocks;
-	unsigned int	meta_bg, meta_bg_size;
-	int		has_super, csum_flag;
-	unsigned long long new_inodes;	/* u64 to check for overflow */
-	double		percent;
-
-	ext2fs_blocks_count_set(fs->super, new_size);
-
-retry:
-	fs->group_desc_count = ext2fs_div64_ceil(ext2fs_blocks_count(fs->super) -
-				       fs->super->s_first_data_block,
-				       EXT2_BLOCKS_PER_GROUP(fs->super));
-	if (fs->group_desc_count == 0)
-		return EXT2_ET_TOOSMALL;
-	fs->desc_blocks = ext2fs_div_ceil(fs->group_desc_count,
-					  EXT2_DESC_PER_BLOCK(fs->super));
-
-	/*
-	 * Overhead is the number of bookkeeping blocks per group.  It
-	 * includes the superblock backup, the group descriptor
-	 * backups, the inode bitmap, the block bitmap, and the inode
-	 * table.
-	 */
-	overhead = (int) (2 + fs->inode_blocks_per_group);
 
-	if (ext2fs_bg_has_super(fs, fs->group_desc_count - 1))
-		overhead += 1 + fs->desc_blocks +
-			fs->super->s_reserved_gdt_blocks;
+	groups = ext2fs_div64_ceil(new_size - fs->super->s_first_data_block,
+				   blk_per_g);
 
+	retval = ext2fs_allocate_block_bitmap(fs, _("blocks to be moved"),
+					      &move_blocks);
+	if (retval)
+		goto errout;
 	/*
-	 * See if the last group is big enough to support the
-	 * necessary data structures.  If not, we need to get rid of
-	 * it.
-	 */
-	rem = (ext2fs_blocks_count(fs->super) - fs->super->s_first_data_block) %
-		fs->super->s_blocks_per_group;
-	if ((fs->group_desc_count == 1) && rem && (rem < overhead))
-		return EXT2_ET_TOOSMALL;
-	if ((fs->group_desc_count > 1) && rem && (rem < overhead+50)) {
-		ext2fs_blocks_count_set(fs->super,
-					ext2fs_blocks_count(fs->super) - rem);
-		goto retry;
-	}
-	/*
-	 * Adjust the number of inodes
+	 * Update the location of the backup superblocks if the sparse_super2
+	 * feature is enabled. Mark new backup descriptor blocks in bitmap
+	 * to move
 	 */
-	new_inodes =(unsigned long long) fs->super->s_inodes_per_group * fs->group_desc_count;
-	if (new_inodes > ~0U) {
-		fprintf(stderr, _("inodes (%llu) must be less than %u"),
-				   new_inodes, ~0U);
-		return EXT2_ET_TOO_MANY_INODES;
+	if (fs->super->s_feature_compat & EXT4_FEATURE_COMPAT_SPARSE_SUPER2 &&
+	    groups < fs->group_desc_count) {
+		dgrp_t last_bg = groups - 1;
+		dgrp_t old_last_bg = fs->group_desc_count - 1;
+
+		if (last_bg > 1 && fs->super->s_backup_bgs[1] == old_last_bg) {
+			blk64_t	desc_blocks = 0;
+			dgrp_t meta_bg, meta_bg_size;
+
+			meta_bg_size = EXT2_DESC_PER_BLOCK(fs->super);
+			meta_bg = last_bg / meta_bg_size;
+
+			if (!(fs->super->s_feature_incompat &
+					EXT2_FEATURE_INCOMPAT_META_BG) ||
+			    (meta_bg < fs->super->s_first_meta_bg)) {
+					desc_blocks = ext2fs_div_ceil(groups,
+						EXT2_DESC_PER_BLOCK(fs->super));
+			} else {
+				if (((last_bg % meta_bg_size) == 0) ||
+				    ((last_bg % meta_bg_size) == 1) ||
+				    ((last_bg % meta_bg_size) == (meta_bg_size-1)))
+					desc_blocks = 1;
+			}
+			fs->super->s_backup_bgs[1] = last_bg;
+			ext2fs_mark_block_bitmap_range2(move_blocks,
+				last_bg * blk_per_g + fs->super->s_first_data_block,
+				1 + desc_blocks);
+		}
+		if (fs->super->s_backup_bgs[0] > last_bg)
+			fs->super->s_backup_bgs[0] = 0;
+		if (fs->super->s_backup_bgs[1] > last_bg)
+			fs->super->s_backup_bgs[1] = 0;
 	}
-	fs->super->s_inodes_count = fs->super->s_inodes_per_group *
-		fs->group_desc_count;
-
-	/*
-	 * Adjust the number of free blocks
-	 */
-	blk = ext2fs_blocks_count(old_fs->super);
-	if (blk > ext2fs_blocks_count(fs->super))
-		ext2fs_free_blocks_count_set(fs->super, 
-			ext2fs_free_blocks_count(fs->super) -
-			(blk - ext2fs_blocks_count(fs->super)));
-	else
-		ext2fs_free_blocks_count_set(fs->super, 
-			ext2fs_free_blocks_count(fs->super) +
-			(ext2fs_blocks_count(fs->super) - blk));
-
-	/*
-	 * Adjust the number of reserved blocks
-	 */
-	percent = (ext2fs_r_blocks_count(old_fs->super) * 100.0) /
-		ext2fs_blocks_count(old_fs->super);
-	ext2fs_r_blocks_count_set(fs->super,
-				  (percent * ext2fs_blocks_count(fs->super) /
-				   100.0));
 
+	/* Mark all blocks beyond new end of fs in bitmap to move */
+	ext2fs_mark_block_bitmap_range2(move_blocks, new_size,
+				ext2fs_blocks_count(fs->super) - new_size);
 	/*
-	 * Adjust the bitmaps for size
+	 * Now have to we unmark metadata of groups which are going away since
+	 * ext2fs_move_blocks() would allocate blocks for them
 	 */
-	retval = ext2fs_resize_inode_bitmap2(fs->super->s_inodes_count,
-					    fs->super->s_inodes_count,
-					    fs->inode_map);
-	if (retval) goto errout;
-
-	real_end = EXT2_GROUPS_TO_BLOCKS(fs->super, fs->group_desc_count) - 1 +
-		fs->super->s_first_data_block;
-	retval = ext2fs_resize_block_bitmap2(new_size - 1,
-					     real_end, fs->block_map);
-	if (retval) goto errout;
+	for (i = groups; i < fs->group_desc_count; i++) {
+		blk_t num_blocks;
+		blk64_t old_desc_blk, new_desc_blk;
+
+		ext2fs_super_and_bgd_loc2(fs, i, &blk, &old_desc_blk,
+					  &new_desc_blk, &num_blocks);
+		if (blk) {
+			ext2fs_unmark_block_bitmap2(move_blocks, blk);
+			num_blocks--;
+		}
+		if (old_desc_blk)
+			blk = old_desc_blk;
+		else
+			blk = new_desc_blk;
 
-	/*
-	 * If we are growing the file system, also grow the size of
-	 * the reserve_blocks bitmap
-	 */
-	if (reserve_blocks && new_size > ext2fs_blocks_count(old_fs->super)) {
-		retval = ext2fs_resize_block_bitmap2(new_size - 1,
-						     real_end, reserve_blocks);
-		if (retval) goto errout;
-	}
+		if (blk)
+			ext2fs_unmark_block_bitmap_range2(move_blocks, blk,
+							  num_blocks);
 
-	/*
-	 * Reallocate the group descriptors as necessary.
-	 */
-	if (old_fs->desc_blocks != fs->desc_blocks) {
-		retval = ext2fs_resize_mem(old_fs->desc_blocks *
-					   fs->blocksize,
-					   fs->desc_blocks * fs->blocksize,
-					   &fs->group_desc);
-		if (retval)
-			goto errout;
-		if (fs->desc_blocks > old_fs->desc_blocks)
-			memset((char *) fs->group_desc +
-			       (old_fs->desc_blocks * fs->blocksize), 0,
-			       (fs->desc_blocks - old_fs->desc_blocks) *
-			       fs->blocksize);
-	}
+		/*
+		 * Mark the blocks used for the inode table
+		 */
+		blk = ext2fs_inode_table_loc(fs, i);
+		if (blk)
+			ext2fs_unmark_block_bitmap_range2(move_blocks, blk,
+						fs->inode_blocks_per_group);
 
-	/*
-	 * If the resize_inode feature is set, and we are changing the
-	 * number of descriptor blocks, then adjust
-	 * s_reserved_gdt_blocks if possible to avoid needing to move
-	 * the inode table either now or in the future.
-	 */
-	adjust_reserved_gdt_blocks(old_fs, fs);
+		/*
+		 * Mark block used for the block bitmap
+		 */
+		blk = ext2fs_block_bitmap_loc(fs, i);
+		if (blk)
+			ext2fs_unmark_block_bitmap2(move_blocks, blk);
 
-	if ((fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) &&
-	    (fs->super->s_first_meta_bg > fs->desc_blocks)) {
-		fs->super->s_feature_incompat &=
-			~EXT2_FEATURE_INCOMPAT_META_BG;
-		fs->super->s_first_meta_bg = 0;
+		/*
+		 * Mark block used for the inode bitmap
+		 */
+		blk = ext2fs_inode_bitmap_loc(fs, i);
+		if (blk)
+			ext2fs_unmark_block_bitmap2(move_blocks, blk);
 	}
 
-	/*
-	 * Update the location of the backup superblocks if the
-	 * sparse_super2 feature is enabled.
-	 */
-	if (fs->super->s_feature_compat & EXT4_FEATURE_COMPAT_SPARSE_SUPER2) {
-		dgrp_t last_bg = fs->group_desc_count - 1;
-		dgrp_t old_last_bg = old_fs->group_desc_count - 1;
+	/* Map of blocks to move is done - let's move them */
+	retval = ext2fs_move_blocks(fs, move_blocks, NULL);
+	if (retval)
+		goto errout;
 
-		if (last_bg > old_last_bg) {
-			if (old_fs->group_desc_count == 1)
-				fs->super->s_backup_bgs[0] = 1;
-			if (old_fs->group_desc_count == 1 &&
-			    fs->super->s_backup_bgs[0])
-				fs->super->s_backup_bgs[0] = last_bg;
-			else if (fs->super->s_backup_bgs[1])
-				fs->super->s_backup_bgs[1] = last_bg;
-		} else if (last_bg < old_last_bg) {
-			if (fs->super->s_backup_bgs[0] > last_bg)
-				fs->super->s_backup_bgs[0] = 0;
-			if (fs->super->s_backup_bgs[1] > last_bg)
-				fs->super->s_backup_bgs[1] = 0;
-			if (last_bg > 1 &&
-			    old_fs->super->s_backup_bgs[1] == old_last_bg)
-				fs->super->s_backup_bgs[1] = last_bg;
-		}
-	}
+	/* Didn't remove any group? No need to move any inodes so we are done */
+	if (groups == fs->group_desc_count)
+		goto errout;
 
-	/*
-	 * If we are shrinking the number of block groups, we're done
-	 * and can exit now.
-	 */
-	if (old_fs->group_desc_count > fs->group_desc_count) {
-		/*
-		 * Check the block groups that we are chopping off
-		 * and free any blocks associated with their metadata
-		 */
-		retval = free_gdp_blocks(fs, reserve_blocks, old_fs,
-					 fs->group_desc_count);
+	/* Move inodes from groups that will be removed */
+	retval = ext2fs_allocate_inode_bitmap(fs, _("inodes to be moved"),
+					      &move_inodes);
+	if (retval)
 		goto errout;
-	}
 
-	/*
-	 * Fix the count of the last (old) block group
-	 */
-	old_numblocks = (ext2fs_blocks_count(old_fs->super) -
-			 old_fs->super->s_first_data_block) %
-				 old_fs->super->s_blocks_per_group;
-	if (!old_numblocks)
-		old_numblocks = old_fs->super->s_blocks_per_group;
-	if (old_fs->group_desc_count == fs->group_desc_count) {
-		numblocks = (ext2fs_blocks_count(fs->super) -
-			     fs->super->s_first_data_block) %
-			fs->super->s_blocks_per_group;
-		if (!numblocks)
-			numblocks = fs->super->s_blocks_per_group;
-	} else
-		numblocks = fs->super->s_blocks_per_group;
-	i = old_fs->group_desc_count - 1;
-	ext2fs_bg_free_blocks_count_set(fs, i, ext2fs_bg_free_blocks_count(fs, i) + (numblocks - old_numblocks));
-	ext2fs_group_desc_csum_set(fs, i);
+	old_inos = fs->group_desc_count * fs->super->s_inodes_per_group;
+	new_inos = groups * fs->super->s_inodes_per_group;
+	for (ino = new_inos; ino < old_inos; ino++)
+		ext2fs_mark_inode_bitmap2(move_inodes, ino);
 
-	/*
-	 * If the number of block groups is staying the same, we're
-	 * done and can exit now.  (If the number block groups is
-	 * shrinking, we had exited earlier.)
-	 */
-	if (old_fs->group_desc_count >= fs->group_desc_count) {
-		retval = 0;
-		goto errout;
-	}
+	retval = ext2fs_move_inodes(fs, move_inodes);
+errout:
+	if (move_inodes)
+		ext2fs_free_inode_bitmap(move_inodes);
+	if (move_blocks)
+		ext2fs_free_block_bitmap(move_blocks);
+	return retval;
+}
+
+/*
+ * Allocate space for group metadata (sb & descriptor backups, bitmaps,
+ * inode table)
+ */
+errcode_t alloc_new_groups(ext2_filsys fs, dgrp_t from)
+{
+	errcode_t	retval;
+	unsigned long	i;
+	int		csum_flag;
+	ext2fs_block_bitmap merged_map = NULL;
 
 	/*
 	 * Initialize the new block group descriptors
 	 */
-	group_block = ext2fs_group_first_block2(fs,
-						old_fs->group_desc_count);
 	csum_flag = ext2fs_has_group_desc_csum(fs);
 	if (!getenv("RESIZE2FS_FORCE_ITABLE_INIT") &&
 	    access("/sys/fs/ext4/features/lazy_itable_init", F_OK) == 0)
 		lazy_itable_init = 1;
-	if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)
-		old_desc_blocks = fs->super->s_first_meta_bg;
-	else
-		old_desc_blocks = fs->desc_blocks +
-			fs->super->s_reserved_gdt_blocks;
+
+	retval = ext2fs_copy_bitmap(fs->block_map, &merged_map);
+	if (retval)
+		return retval;
 
 	/*
 	 * If we changed the number of block_group descriptor blocks,
-	 * we need to make sure they are all marked as reserved in the
-	 * file systems's block allocation map.
+	 * we need to make sure they are all marked as reserved so that
+	 * ext2fs_allocate_group_table2() called a bit later doesn't use
+	 * these blocks for new group's metadata. We mark the blocks as
+	 * used in the block bitmap once we free them up.
 	 */
-	for (i = 0; i < old_fs->group_desc_count; i++)
-		ext2fs_reserve_super_and_bgd(fs, i, fs->block_map);
+	for (i = 0; i < from; i++)
+		ext2fs_reserve_super_and_bgd(fs, i, merged_map);
 
-	for (i = old_fs->group_desc_count;
-	     i < fs->group_desc_count; i++) {
+	for (i = from; i < fs->group_desc_count; i++) {
 		memset(ext2fs_group_desc(fs, fs->group_desc, i), 0,
 		       sizeof(struct ext2_group_desc));
-		adjblocks = 0;
 
 		ext2fs_bg_flags_zap(fs, i);
 		if (csum_flag) {
@@ -614,115 +593,34 @@ retry:
 					fs->super->s_inodes_per_group);
 		}
 
-		numblocks = ext2fs_group_blocks_count(fs, i);
-		if ((i < fs->group_desc_count - 1) && csum_flag)
+		if ((i < fs->group_desc_count - 1) && csum_flag &&
+		    !ext2fs_bg_has_super(fs, i))
 			ext2fs_bg_flags_set(fs, i, EXT2_BG_BLOCK_UNINIT);
 
-		has_super = ext2fs_bg_has_super(fs, i);
-		if (has_super) {
-			ext2fs_block_alloc_stats2(fs, group_block, +1);
-			adjblocks++;
-		}
-		meta_bg_size = EXT2_DESC_PER_BLOCK(fs->super);
-		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) {
-				for (j=0; j < old_desc_blocks; j++)
-					ext2fs_block_alloc_stats2(fs,
-						 group_block + 1 + j, +1);
-				adjblocks += old_desc_blocks;
-			}
-		} 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_block_alloc_stats2(fs,
-						 group_block + has_super, +1);
-		}
-
-		adjblocks += 2 + fs->inode_blocks_per_group;
-
-		numblocks -= adjblocks;
-		ext2fs_free_blocks_count_set(fs->super,
-			     ext2fs_free_blocks_count(fs->super) - adjblocks);
-		fs->super->s_free_inodes_count +=
-			fs->super->s_inodes_per_group;
-		ext2fs_bg_free_blocks_count_set(fs, i, numblocks);
-		ext2fs_bg_free_inodes_count_set(fs, i,
-						fs->super->s_inodes_per_group);
 		ext2fs_bg_used_dirs_count_set(fs, i, 0);
-		ext2fs_group_desc_csum_set(fs, i);
 
-		retval = ext2fs_allocate_group_table(fs, i, 0);
-		if (retval) goto errout;
+		ext2fs_reserve_super_and_bgd(fs, i, fs->block_map);
+		ext2fs_reserve_super_and_bgd(fs, i, merged_map);
 
-		group_block += fs->super->s_blocks_per_group;
+		retval = ext2fs_allocate_group_table2(fs, i, merged_map,
+					EXT2FS_ALLOC_TABLE_SET_BLOCK_BITMAP);
+		if (retval)
+			goto errout;
 	}
-	retval = 0;
-
-	/*
-	 * Mark all of the metadata blocks as reserved so they won't
-	 * get allocated by the call to ext2fs_allocate_group_table()
-	 * in blocks_to_move(), where we allocate new blocks to
-	 * replace those allocation bitmap and inode table blocks
-	 * which have to get relocated to make space for an increased
-	 * number of the block group descriptors.
-	 */
-	if (reserve_blocks)
-		mark_table_blocks(fs, reserve_blocks);
 
 errout:
-	return (retval);
+	if (merged_map)
+		ext2fs_free_block_bitmap(merged_map);
+	return retval;
 }
 
-/*
- * This routine adjusts the superblock and other data structures, both
- * in disk as well as in memory...
- */
-static errcode_t adjust_superblock(ext2_resize_t rfs, blk64_t new_size)
+/* Initialize inode tables in new block groups. */
+static errcode_t init_new_itables(ext2_resize_t rfs)
 {
-	ext2_filsys	fs = rfs->new_fs;
-	int		adj = 0;
 	errcode_t	retval;
-	blk64_t		group_block;
+	ext2_filsys	old_fs = rfs->old_fs, fs = rfs->new_fs;
+	dgrp_t		max_group, adj;
 	unsigned long	i;
-	unsigned long	max_group;
-
-	ext2fs_mark_super_dirty(fs);
-	ext2fs_mark_bb_dirty(fs);
-	ext2fs_mark_ib_dirty(fs);
-
-	retval = ext2fs_allocate_block_bitmap(fs, _("reserved blocks"),
-					      &rfs->reserve_blocks);
-	if (retval)
-		return retval;
-
-	retval = adjust_fs_info(fs, rfs->old_fs, rfs->reserve_blocks, new_size);
-	if (retval)
-		goto errout;
-
-	/*
-	 * Check to make sure there are enough inodes
-	 */
-	if ((rfs->old_fs->super->s_inodes_count -
-	     rfs->old_fs->super->s_free_inodes_count) >
-	    rfs->new_fs->super->s_inodes_count) {
-		retval = ENOSPC;
-		goto errout;
-	}
-
-	/*
-	 * If we are not increasing the number block groups, we're done and
-	 * can exit now.
-	 */
-	if (rfs->old_fs->group_desc_count >= fs->group_desc_count) {
-		retval = 0;
-		goto errout;
-	}
 
 	/*
 	 * If we are using uninit_bg (aka GDT_CSUM) and the kernel
@@ -734,18 +632,7 @@ static errcode_t adjust_superblock(ext2_resize_t rfs, blk64_t new_size)
 		goto errout;
 	}
 
-	/*
-	 * Initialize the inode table
-	 */
-	retval = ext2fs_get_array(fs->blocksize, fs->inode_blocks_per_group,
-				&rfs->itable_buf);
-	if (retval)
-		goto errout;
-
-	memset(rfs->itable_buf, 0, fs->blocksize * fs->inode_blocks_per_group);
-	group_block = ext2fs_group_first_block2(fs,
-						rfs->old_fs->group_desc_count);
-	adj = rfs->old_fs->group_desc_count;
+	adj = old_fs->group_desc_count;
 	max_group = fs->group_desc_count - adj;
 	if (rfs->progress) {
 		retval = rfs->progress(rfs, E2_RSZ_EXTEND_ITABLE_PASS,
@@ -753,8 +640,7 @@ static errcode_t adjust_superblock(ext2_resize_t rfs, blk64_t new_size)
 		if (retval)
 			goto errout;
 	}
-	for (i = rfs->old_fs->group_desc_count;
-	     i < fs->group_desc_count; i++) {
+	for (i = old_fs->group_desc_count; i < fs->group_desc_count; i++) {
 		/*
 		 * Write out the new inode table
 		 */
@@ -771,1320 +657,320 @@ static errcode_t adjust_superblock(ext2_resize_t rfs, blk64_t new_size)
 			if (retval)
 				goto errout;
 		}
-		group_block += fs->super->s_blocks_per_group;
 	}
 	io_channel_flush(fs->io);
 	retval = 0;
-
 errout:
-	return retval;
-}
-
-/* --------------------------------------------------------------------
- *
- * Resize processing, phase 2.
- *
- * In this phase we adjust determine which blocks need to be moved, in
- * blocks_to_move().  We then copy the blocks to their ultimate new
- * destinations using block_mover().  Since we are copying blocks to
- * their new locations, again during this pass we can abort without
- * any problems.
- * --------------------------------------------------------------------
- */
-
-/*
- * This helper function creates a block bitmap with all of the
- * filesystem meta-data blocks.
- */
-static errcode_t mark_table_blocks(ext2_filsys fs,
-				   ext2fs_block_bitmap bmap)
-{
-	dgrp_t			i;
-	blk64_t			blk;
-
-	for (i = 0; i < fs->group_desc_count; i++) {
-		ext2fs_reserve_super_and_bgd(fs, i, bmap);
-
-		/*
-		 * Mark the blocks used for the inode table
-		 */
-		blk = ext2fs_inode_table_loc(fs, i);
-		if (blk)
-			ext2fs_mark_block_bitmap_range2(bmap, blk,
-						fs->inode_blocks_per_group);
-
-		/*
-		 * Mark block used for the block bitmap
-		 */
-		blk = ext2fs_block_bitmap_loc(fs, i);
-		if (blk)
-			ext2fs_mark_block_bitmap2(bmap, blk);
-
-		/*
-		 * Mark block used for the inode bitmap
-		 */
-		blk = ext2fs_inode_bitmap_loc(fs, i);
-		if (blk)
-			ext2fs_mark_block_bitmap2(bmap, blk);
-	}
-	return 0;
-}
-
-/*
- * This function checks to see if a particular block (either a
- * superblock or a block group descriptor) overlaps with an inode or
- * block bitmap block, or with the inode table.
- */
-static void mark_fs_metablock(ext2_resize_t rfs,
-			      ext2fs_block_bitmap meta_bmap,
-			      int group, blk64_t blk)
-{
-	ext2_filsys 	fs = rfs->new_fs;
 
-	ext2fs_mark_block_bitmap2(rfs->reserve_blocks, blk);
-	ext2fs_block_alloc_stats2(fs, blk, +1);
-
-	/*
-	 * Check to see if we overlap with the inode or block bitmap,
-	 * or the inode tables.  If not, and the block is in use, then
-	 * mark it as a block to be moved.
-	 */
-	if (IS_BLOCK_BM(fs, group, blk)) {
-		ext2fs_block_bitmap_loc_set(fs, group, 0);
-		rfs->needed_blocks++;
-		return;
-	}
-	if (IS_INODE_BM(fs, group, blk)) {
-		ext2fs_inode_bitmap_loc_set(fs, group, 0);
-		rfs->needed_blocks++;
-		return;
-	}
-	if (IS_INODE_TB(fs, group, blk)) {
-		ext2fs_inode_table_loc_set(fs, group, 0);
-		rfs->needed_blocks++;
-		return;
-	}
-	if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_FLEX_BG) {
-		dgrp_t i;
-
-		for (i=0; i < rfs->old_fs->group_desc_count; i++) {
-			if (IS_BLOCK_BM(fs, i, blk)) {
-				ext2fs_block_bitmap_loc_set(fs, i, 0);
-				rfs->needed_blocks++;
-				return;
-			}
-			if (IS_INODE_BM(fs, i, blk)) {
-				ext2fs_inode_bitmap_loc_set(fs, i, 0);
-				rfs->needed_blocks++;
-				return;
-			}
-			if (IS_INODE_TB(fs, i, blk)) {
-				ext2fs_inode_table_loc_set(fs, i, 0);
-				rfs->needed_blocks++;
-				return;
-			}
-		}
-	}
-
-	if (ext2fs_has_group_desc_csum(fs) &&
-	    (ext2fs_bg_flags_test(fs, group, EXT2_BG_BLOCK_UNINIT))) {
-		/*
-		 * If the block bitmap is uninitialized, which means
-		 * nothing other than standard metadata in use.
-		 */
-		return;
-	} else if (ext2fs_test_block_bitmap2(rfs->old_fs->block_map, blk) &&
-		   !ext2fs_test_block_bitmap2(meta_bmap, blk)) {
-		ext2fs_mark_block_bitmap2(rfs->move_blocks, blk);
-		rfs->needed_blocks++;
-	}
+	return retval;
 }
 
-
 /*
- * This routine marks and unmarks reserved blocks in the new block
- * bitmap.  It also determines which blocks need to be moved and
- * places this information into the move_blocks bitmap.
+ * This routine is shared by the online and offline resize routines.
+ * All of the information which is adjusted in memory is done here.
  */
-static errcode_t blocks_to_move(ext2_resize_t rfs)
+errcode_t adjust_fs_info(ext2_filsys fs, ext2_filsys old_fs, blk64_t new_size)
 {
-	int		j, has_super;
-	dgrp_t		i, max_groups, g;
-	blk64_t		blk, group_blk;
-	blk64_t		old_blocks, new_blocks, group_end, cluster_freed;
-	blk64_t		new_size;
-	unsigned int	meta_bg, meta_bg_size;
 	errcode_t	retval;
-	ext2_filsys 	fs, old_fs;
-	ext2fs_block_bitmap	meta_bmap, new_meta_bmap = NULL;
-	int		flex_bg;
-
-	fs = rfs->new_fs;
-	old_fs = rfs->old_fs;
-	if (ext2fs_blocks_count(old_fs->super) > ext2fs_blocks_count(fs->super))
-		fs = rfs->old_fs;
-
-	retval = ext2fs_allocate_block_bitmap(fs, _("blocks to be moved"),
-					      &rfs->move_blocks);
-	if (retval)
-		return retval;
-
-	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;
-
-	fs = rfs->new_fs;
-
-	/*
-	 * If we're shrinking the filesystem, we need to move any
-	 * group's metadata blocks (either allocation bitmaps or the
-	 * inode table) which are beyond the end of the new
-	 * filesystem.
-	 */
-	new_size = ext2fs_blocks_count(fs->super);
-	if (new_size < ext2fs_blocks_count(old_fs->super)) {
-		for (g = 0; g < fs->group_desc_count; g++) {
-			int realloc = 0;
-			/*
-			 * ext2fs_allocate_group_table will re-allocate any
-			 * metadata blocks whose location is set to zero.
-			 */
-			if (ext2fs_block_bitmap_loc(fs, g) >= new_size) {
-				ext2fs_block_bitmap_loc_set(fs, g, 0);
-				realloc = 1;
-			}
-			if (ext2fs_inode_bitmap_loc(fs, g) >= new_size) {
-				ext2fs_inode_bitmap_loc_set(fs, g, 0);
-				realloc = 1;
-			}
-			if ((ext2fs_inode_table_loc(fs, g) +
-			     fs->inode_blocks_per_group) > new_size) {
-				ext2fs_inode_table_loc_set(fs, g, 0);
-				realloc = 1;
-			}
-
-			if (realloc) {
-				retval = ext2fs_allocate_group_table(fs, g, 0);
-				if (retval)
-					return retval;
-			}
-		}
-	}
-
-	/*
-	 * If we're shrinking the filesystem, we need to move all of
-	 * the blocks that don't fit any more
-	 */
-	for (blk = ext2fs_blocks_count(fs->super);
-	     blk < ext2fs_blocks_count(old_fs->super); blk++) {
-		g = ext2fs_group_of_blk2(fs, blk);
-		if (ext2fs_has_group_desc_csum(fs) &&
-		    ext2fs_bg_flags_test(old_fs, g, EXT2_BG_BLOCK_UNINIT)) {
-			/*
-			 * The block bitmap is uninitialized, so skip
-			 * to the next block group.
-			 */
-			blk = ext2fs_group_first_block2(fs, g+1) - 1;
-			continue;
-		}
-		if (ext2fs_test_block_bitmap2(old_fs->block_map, blk) &&
-		    !ext2fs_test_block_bitmap2(meta_bmap, blk)) {
-			ext2fs_mark_block_bitmap2(rfs->move_blocks, blk);
-			rfs->needed_blocks++;
-		}
-		ext2fs_mark_block_bitmap2(rfs->reserve_blocks, blk);
-	}
-
-	if (old_fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)
-		old_blocks = old_fs->super->s_first_meta_bg;
-	else
-		old_blocks = old_fs->desc_blocks +
-			old_fs->super->s_reserved_gdt_blocks;
-	if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)
-		new_blocks = fs->super->s_first_meta_bg;
-	else
-		new_blocks = fs->desc_blocks + fs->super->s_reserved_gdt_blocks;
-
-	retval = reserve_sparse_super2_last_group(rfs, meta_bmap);
-	if (retval)
-		goto errout;
+	blk64_t		blk, group_block;
+	blk64_t		real_end;
+	unsigned long	i;
+	double		percent;
 
-	if (old_blocks == new_blocks) {
-		retval = 0;
-		goto errout;
-	}
+	ext2fs_blocks_count_set(fs->super, new_size);
+	fs->group_desc_count = ext2fs_div64_ceil(new_size -
+				       fs->super->s_first_data_block,
+				       EXT2_BLOCKS_PER_GROUP(fs->super));
+	fs->desc_blocks = ext2fs_div_ceil(fs->group_desc_count,
+					  EXT2_DESC_PER_BLOCK(fs->super));
+	fs->super->s_inodes_count = fs->super->s_inodes_per_group *
+		fs->group_desc_count;
 
-	max_groups = fs->group_desc_count;
-	if (max_groups > old_fs->group_desc_count)
-		max_groups = old_fs->group_desc_count;
-	group_blk = old_fs->super->s_first_data_block;
 	/*
-	 * If we're reducing the number of descriptor blocks, this
-	 * makes life easy.  :-)   We just have to mark some extra
-	 * blocks as free.
+	 * Don't update free blocks count. That gets recalculated when we are
+	 * done.
 	 */
-	if (old_blocks > new_blocks) {
-		if (EXT2FS_CLUSTER_RATIO(fs) > 1) {
-			retval = ext2fs_allocate_block_bitmap(fs,
-							_("new meta blocks"),
-							&new_meta_bmap);
-			if (retval)
-				goto errout;
-
-			retval = mark_table_blocks(fs, new_meta_bmap);
-			if (retval)
-				goto errout;
-		}
-
-		for (i = 0; i < max_groups; i++) {
-			if (!ext2fs_bg_has_super(old_fs, i)) {
-				group_blk += fs->super->s_blocks_per_group;
-				continue;
-			}
-			group_end = group_blk + 1 + old_blocks;
-			for (blk = group_blk + 1 + new_blocks;
-			     blk < group_end;) {
-				if (new_meta_bmap == NULL ||
-				    !ext2fs_test_block_bitmap2(new_meta_bmap,
-							       blk)) {
-					cluster_freed =
-						EXT2FS_CLUSTER_RATIO(fs) -
-						(blk &
-						 EXT2FS_CLUSTER_MASK(fs));
-					if (cluster_freed > group_end - blk)
-						cluster_freed = group_end - blk;
-					ext2fs_block_alloc_stats2(fs, blk, -1);
-					blk += EXT2FS_CLUSTER_RATIO(fs);
-					rfs->needed_blocks -= cluster_freed;
-					continue;
-				}
-				rfs->needed_blocks--;
-				blk++;
-			}
-			group_blk += fs->super->s_blocks_per_group;
-		}
-		retval = 0;
-		goto errout;
-	}
-	/*
-	 * If we're increasing the number of descriptor blocks, life
-	 * gets interesting....
-	 */
-	meta_bg_size = EXT2_DESC_PER_BLOCK(fs->super);
-	flex_bg = fs->super->s_feature_incompat &
-		EXT4_FEATURE_INCOMPAT_FLEX_BG;
-	/* first reserve all of the existing fs meta blocks */
-	for (i = 0; i < max_groups; i++) {
-		has_super = ext2fs_bg_has_super(fs, i);
-		if (has_super)
-			mark_fs_metablock(rfs, meta_bmap, i, group_blk);
-
-		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) {
-				for (blk = group_blk+1;
-				     blk < group_blk + 1 + new_blocks; blk++)
-					mark_fs_metablock(rfs, meta_bmap,
-							  i, blk);
-			}
-		} 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)))
-				mark_fs_metablock(rfs, meta_bmap, i,
-						  group_blk + has_super);
-		}
-
-		/*
-		 * Reserve the existing meta blocks that we know
-		 * aren't to be moved.
-		 *
-		 * For flex_bg file systems, in order to avoid
-		 * overwriting fs metadata (especially inode table
-		 * blocks) belonging to a different block group when
-		 * we are relocating the inode tables, we need to
-		 * reserve all existing fs metadata blocks.
-		 */
-		if (ext2fs_block_bitmap_loc(fs, i))
-			ext2fs_mark_block_bitmap2(rfs->reserve_blocks,
-				 ext2fs_block_bitmap_loc(fs, i));
-		else if (flex_bg && i < old_fs->group_desc_count)
-			ext2fs_mark_block_bitmap2(rfs->reserve_blocks,
-				 ext2fs_block_bitmap_loc(old_fs, i));
-
-		if (ext2fs_inode_bitmap_loc(fs, i))
-			ext2fs_mark_block_bitmap2(rfs->reserve_blocks,
-				 ext2fs_inode_bitmap_loc(fs, i));
-		else if (flex_bg && i < old_fs->group_desc_count)
-			ext2fs_mark_block_bitmap2(rfs->reserve_blocks,
-				 ext2fs_inode_bitmap_loc(old_fs, i));
-
-		if (ext2fs_inode_table_loc(fs, i))
-			ext2fs_mark_block_bitmap_range2(rfs->reserve_blocks,
-					ext2fs_inode_table_loc(fs, i),
-					fs->inode_blocks_per_group);
-		else if (flex_bg && i < old_fs->group_desc_count)
-			ext2fs_mark_block_bitmap_range2(rfs->reserve_blocks,
-					ext2fs_inode_table_loc(old_fs, i),
-					old_fs->inode_blocks_per_group);
-
-		group_blk += rfs->new_fs->super->s_blocks_per_group;
-	}
-
-	/* Allocate the missing data structures */
-	for (i = 0; i < max_groups; i++) {
-		if (ext2fs_inode_table_loc(fs, i) &&
-		    ext2fs_inode_bitmap_loc(fs, i) &&
-		    ext2fs_block_bitmap_loc(fs, i))
-			continue;
-
-		retval = ext2fs_allocate_group_table2(fs, i,
-				rfs->reserve_blocks,
-				EXT2FS_ALLOC_TABLE_UPDATE_STATS |
-				EXT2FS_ALLOC_TABLE_SET_BLOCK_BITMAP);
-		if (retval)
-			goto errout;
-
-		/*
-		 * For those structures that have changed, we need to
-		 * do bookkeepping.
-		 */
-		if (ext2fs_block_bitmap_loc(old_fs, i) !=
-		    (blk = ext2fs_block_bitmap_loc(fs, i))) {
-			if (ext2fs_test_block_bitmap2(old_fs->block_map, blk) &&
-			    !ext2fs_test_block_bitmap2(meta_bmap, blk))
-				ext2fs_mark_block_bitmap2(rfs->move_blocks,
-							 blk);
-		}
-		if (ext2fs_inode_bitmap_loc(old_fs, i) !=
-		    (blk = ext2fs_inode_bitmap_loc(fs, i))) {
-			if (ext2fs_test_block_bitmap2(old_fs->block_map, blk) &&
-			    !ext2fs_test_block_bitmap2(meta_bmap, blk))
-				ext2fs_mark_block_bitmap2(rfs->move_blocks,
-							 blk);
-		}
-
-		/*
-		 * The inode table, if we need to relocate it, is
-		 * handled specially.  We have to reserve the blocks
-		 * for both the old and the new inode table, since we
-		 * can't have the inode table be destroyed during the
-		 * block relocation phase.
-		 */
-		if (ext2fs_inode_table_loc(fs, i) == ext2fs_inode_table_loc(old_fs, i))
-			continue;	/* inode table not moved */
-
-		rfs->needed_blocks += fs->inode_blocks_per_group;
-
-		/*
-		 * Mark the new inode table as in use in the new block
-		 * allocation bitmap, and move any blocks that might
-		 * be necessary.
-		 */
-		for (blk = ext2fs_inode_table_loc(fs, i), j=0;
-		     j < fs->inode_blocks_per_group ; j++, blk++) {
-			if (ext2fs_test_block_bitmap2(old_fs->block_map, blk) &&
-			    !ext2fs_test_block_bitmap2(meta_bmap, blk))
-				ext2fs_mark_block_bitmap2(rfs->move_blocks,
-							 blk);
-		}
-
-		/*
-		 * Make sure the old inode table is reserved in the
-		 * block reservation bitmap.
-		 */
-		for (blk = ext2fs_inode_table_loc(rfs->old_fs, i), j=0;
-		     j < fs->inode_blocks_per_group ; j++, blk++)
-			ext2fs_mark_block_bitmap2(rfs->reserve_blocks, blk);
-	}
-	retval = 0;
-
-errout:
-	if (new_meta_bmap)
-		ext2fs_free_block_bitmap(new_meta_bmap);
-	if (meta_bmap)
-		ext2fs_free_block_bitmap(meta_bmap);
-
-	return retval;
-}
-
-/*
- * This helper function tries to allocate a new block.  We try to
- * avoid hitting the original group descriptor blocks at least at
- * first, since we want to make it possible to recover from a badly
- * aborted resize operation as much as possible.
- *
- * In the future, I may further modify this routine to balance out
- * where we get the new blocks across the various block groups.
- * Ideally we would allocate blocks that corresponded with the block
- * group of the containing inode, and keep contiguous blocks
- * together.  However, this very difficult to do efficiently, since we
- * don't have the necessary information up front.
- */
-
-#define AVOID_OLD	1
-#define DESPERATION	2
-
-static void init_block_alloc(ext2_resize_t rfs)
-{
-	rfs->alloc_state = AVOID_OLD;
-	rfs->new_blk = rfs->new_fs->super->s_first_data_block;
-#if 0
-	/* HACK for testing */
-	if (ext2fs_blocks_count(rfs->new_fs->super) >
-	    ext2fs_blocks_count(rfs->old_fs->super))
-		rfs->new_blk = ext2fs_blocks_count(rfs->old_fs->super);
-#endif
-}
-
-static blk64_t get_new_block(ext2_resize_t rfs)
-{
-	ext2_filsys	fs = rfs->new_fs;
-
-	while (1) {
-		if (rfs->new_blk >= ext2fs_blocks_count(fs->super)) {
-			if (rfs->alloc_state == DESPERATION)
-				return 0;
-
-#ifdef RESIZE2FS_DEBUG
-			if (rfs->flags & RESIZE_DEBUG_BMOVE)
-				printf("Going into desperation mode "
-				       "for block allocations\n");
-#endif
-			rfs->alloc_state = DESPERATION;
-			rfs->new_blk = fs->super->s_first_data_block;
-			continue;
-		}
-		if (ext2fs_test_block_bitmap2(fs->block_map, rfs->new_blk) ||
-		    ext2fs_test_block_bitmap2(rfs->reserve_blocks,
-					     rfs->new_blk) ||
-		    ((rfs->alloc_state == AVOID_OLD) &&
-		     (rfs->new_blk < ext2fs_blocks_count(rfs->old_fs->super)) &&
-		     ext2fs_test_block_bitmap2(rfs->old_fs->block_map,
-					      rfs->new_blk))) {
-			rfs->new_blk++;
-			continue;
-		}
-		return rfs->new_blk;
-	}
-}
-
-static errcode_t resize2fs_get_alloc_block(ext2_filsys fs, blk64_t goal,
-					   blk64_t *ret)
-{
-	ext2_resize_t rfs = (ext2_resize_t) fs->priv_data;
-	blk64_t blk;
-
-	blk = get_new_block(rfs);
-	if (!blk)
-		return ENOSPC;
-
-#ifdef RESIZE2FS_DEBUG
-	if (rfs->flags & 0xF)
-		printf("get_alloc_block allocating %llu\n", blk);
-#endif
-
-	ext2fs_mark_block_bitmap2(rfs->old_fs->block_map, blk);
-	ext2fs_mark_block_bitmap2(rfs->new_fs->block_map, blk);
-	*ret = (blk64_t) blk;
-	return 0;
-}
-
-static errcode_t block_mover(ext2_resize_t rfs)
-{
-	blk64_t			blk, old_blk, new_blk;
-	ext2_filsys		fs = rfs->new_fs;
-	ext2_filsys		old_fs = rfs->old_fs;
-	errcode_t		retval;
-	__u64			size;
-	int			c;
-	int			to_move, moved;
-	ext2_badblocks_list	badblock_list = 0;
-	int			bb_modified = 0;
-
-	fs->get_alloc_block = resize2fs_get_alloc_block;
-	old_fs->get_alloc_block = resize2fs_get_alloc_block;
-
-	retval = ext2fs_read_bb_inode(old_fs, &badblock_list);
-	if (retval)
-		return retval;
-
-	new_blk = fs->super->s_first_data_block;
-	if (!rfs->itable_buf) {
-		retval = ext2fs_get_array(fs->blocksize,
-					fs->inode_blocks_per_group,
-					&rfs->itable_buf);
-		if (retval)
-			return retval;
-	}
-	retval = ext2fs_create_extent_table(&rfs->bmap, 0);
-	if (retval)
-		return retval;
 
 	/*
-	 * The first step is to figure out where all of the blocks
-	 * will go.
+	 * Adjust the number of reserved blocks
 	 */
-	to_move = moved = 0;
-	init_block_alloc(rfs);
-	for (blk = B2C(old_fs->super->s_first_data_block);
-	     blk < ext2fs_blocks_count(old_fs->super);
-	     blk += EXT2FS_CLUSTER_RATIO(fs)) {
-		if (!ext2fs_test_block_bitmap2(old_fs->block_map, blk))
-			continue;
-		if (!ext2fs_test_block_bitmap2(rfs->move_blocks, blk))
-			continue;
-		if (ext2fs_badblocks_list_test(badblock_list, blk)) {
-			ext2fs_badblocks_list_del(badblock_list, blk);
-			bb_modified++;
-			continue;
-		}
-
-		new_blk = get_new_block(rfs);
-		if (!new_blk) {
-			retval = ENOSPC;
-			goto errout;
-		}
-		ext2fs_block_alloc_stats2(fs, new_blk, +1);
-		ext2fs_add_extent_entry(rfs->bmap, B2C(blk), B2C(new_blk));
-		to_move++;
-	}
-
-	if (to_move == 0) {
-		if (rfs->bmap) {
-			ext2fs_free_extent_table(rfs->bmap);
-			rfs->bmap = 0;
-		}
-		retval = 0;
-		goto errout;
-	}
+	percent = (ext2fs_r_blocks_count(old_fs->super) * 100.0) /
+		ext2fs_blocks_count(old_fs->super);
+	ext2fs_r_blocks_count_set(fs->super,
+				  (percent * ext2fs_blocks_count(fs->super) /
+				   100.0));
 
 	/*
-	 * Step two is to actually move the blocks
+	 * Adjust the bitmaps for size
 	 */
-	retval =  ext2fs_iterate_extent(rfs->bmap, 0, 0, 0);
+	retval = ext2fs_resize_inode_bitmap2(fs->super->s_inodes_count,
+					    fs->super->s_inodes_count,
+					    fs->inode_map);
 	if (retval) goto errout;
 
-	if (rfs->progress) {
-		retval = (rfs->progress)(rfs, E2_RSZ_BLOCK_RELOC_PASS,
-					 0, to_move);
-		if (retval)
-			goto errout;
-	}
-	while (1) {
-		retval = ext2fs_iterate_extent(rfs->bmap, &old_blk, &new_blk, &size);
-		if (retval) goto errout;
-		if (!size)
-			break;
-		old_blk = C2B(old_blk);
-		new_blk = C2B(new_blk);
-		size = C2B(size);
-#ifdef RESIZE2FS_DEBUG
-		if (rfs->flags & RESIZE_DEBUG_BMOVE)
-			printf("Moving %llu blocks %llu->%llu\n",
-			       size, old_blk, new_blk);
-#endif
-		do {
-			c = size;
-			if (c > fs->inode_blocks_per_group)
-				c = fs->inode_blocks_per_group;
-			retval = io_channel_read_blk64(fs->io, old_blk, c,
-						       rfs->itable_buf);
-			if (retval) goto errout;
-			retval = io_channel_write_blk64(fs->io, new_blk, c,
-							rfs->itable_buf);
-			if (retval) goto errout;
-			size -= c;
-			new_blk += c;
-			old_blk += c;
-			moved += c;
-			if (rfs->progress) {
-				io_channel_flush(fs->io);
-				retval = (rfs->progress)(rfs,
-						E2_RSZ_BLOCK_RELOC_PASS,
-						moved, to_move);
-				if (retval)
-					goto errout;
-			}
-		} while (size > 0);
-		io_channel_flush(fs->io);
-	}
-
-errout:
-	if (badblock_list) {
-		if (!retval && bb_modified)
-			retval = ext2fs_update_bb_inode(old_fs,
-							badblock_list);
-		ext2fs_badblocks_list_free(badblock_list);
-	}
-	return retval;
-}
-
-
-/* --------------------------------------------------------------------
- *
- * Resize processing, phase 3
- *
- * --------------------------------------------------------------------
- */
-
-
-/*
- * The extent translation table is stored in clusters so we need to
- * take special care when mapping a source block number to its
- * destination block number.
- */
-static __u64 extent_translate(ext2_filsys fs, ext2_extent extent, __u64 old_loc)
-{
-	__u64 new_block = C2B(ext2fs_extent_translate(extent, B2C(old_loc)));
-
-	if (new_block != 0)
-		new_block += old_loc & (EXT2FS_CLUSTER_RATIO(fs) - 1);
-	return new_block;
-}
-
-struct process_block_struct {
-	ext2_resize_t 		rfs;
-	ext2_ino_t		ino;
-	ext2_ino_t		old_ino;
-	struct ext2_inode *	inode;
-	errcode_t		error;
-	int			is_dir;
-	int			changed;
-	int			has_extents;
-};
-
-static int process_block(ext2_filsys fs, blk64_t	*block_nr,
-			 e2_blkcnt_t blockcnt,
-			 blk64_t ref_block EXT2FS_ATTR((unused)),
-			 int ref_offset EXT2FS_ATTR((unused)), void *priv_data)
-{
-	struct process_block_struct *pb;
-	errcode_t	retval;
-	blk64_t		block, new_block;
-	int		ret = 0;
-
-	pb = (struct process_block_struct *) priv_data;
-	block = *block_nr;
-	if (pb->rfs->bmap) {
-		new_block = extent_translate(fs, pb->rfs->bmap, block);
-		if (new_block) {
-			*block_nr = new_block;
-			ret |= BLOCK_CHANGED;
-			pb->changed = 1;
-#ifdef RESIZE2FS_DEBUG
-			if (pb->rfs->flags & RESIZE_DEBUG_BMOVE)
-				printf("ino=%u, blockcnt=%lld, %llu->%llu\n",
-				       pb->old_ino, blockcnt, block,
-				       new_block);
-#endif
-			block = new_block;
-		}
-	}
-
-	if (pb->is_dir) {
-		retval = ext2fs_add_dir_block2(fs->dblist, pb->ino,
-					       block, (int) blockcnt);
-		if (retval) {
-			pb->error = retval;
-			ret |= BLOCK_ABORT;
-		}
-	}
-	return ret;
-}
-
-/*
- * Progress callback
- */
-static errcode_t progress_callback(ext2_filsys fs,
-				   ext2_inode_scan scan EXT2FS_ATTR((unused)),
-				   dgrp_t group, void * priv_data)
-{
-	ext2_resize_t rfs = (ext2_resize_t) priv_data;
-	errcode_t		retval;
+	real_end = EXT2_GROUPS_TO_BLOCKS(fs->super, fs->group_desc_count) - 1 +
+		fs->super->s_first_data_block;
+	retval = ext2fs_resize_block_bitmap2(new_size - 1,
+					     real_end, fs->block_map);
+	if (retval) goto errout;
 
 	/*
-	 * This check is to protect against old ext2 libraries.  It
-	 * shouldn't be needed against new libraries.
+	 * Reallocate the group descriptors as necessary.
 	 */
-	if ((group+1) == 0)
-		return 0;
-
-	if (rfs->progress) {
-		io_channel_flush(fs->io);
-		retval = (rfs->progress)(rfs, E2_RSZ_INODE_SCAN_PASS,
-					 group+1, fs->group_desc_count);
-		if (retval)
-			return retval;
-	}
-
-	return 0;
-}
-
-static errcode_t migrate_ea_block(ext2_resize_t rfs, ext2_ino_t ino,
-				  struct ext2_inode *inode, int *changed)
-{
-	char *buf = NULL;
-	blk64_t new_block;
-	errcode_t err = 0;
-
-	/* No EA block or no remapping?  Quit early. */
-	if (ext2fs_file_acl_block(rfs->old_fs, inode) == 0 && !rfs->bmap)
-		return 0;
-	new_block = extent_translate(rfs->old_fs, rfs->bmap,
-		ext2fs_file_acl_block(rfs->old_fs, inode));
-	if (new_block == 0)
-		return 0;
-
-	/* Set the new ACL block */
-	ext2fs_file_acl_block_set(rfs->old_fs, inode, new_block);
-
-	/* Update checksum */
-	if (EXT2_HAS_RO_COMPAT_FEATURE(rfs->new_fs->super,
-			EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) {
-		err = ext2fs_get_mem(rfs->old_fs->blocksize, &buf);
-		if (err)
-			return err;
-		rfs->old_fs->flags |= EXT2_FLAG_IGNORE_CSUM_ERRORS;
-		err = ext2fs_read_ext_attr3(rfs->old_fs, new_block, buf, ino);
-		rfs->old_fs->flags &= ~EXT2_FLAG_IGNORE_CSUM_ERRORS;
-		if (err)
-			goto out;
-		err = ext2fs_write_ext_attr3(rfs->old_fs, new_block, buf, ino);
-		if (err)
-			goto out;
-	}
-	*changed = 1;
-
-out:
-	ext2fs_free_mem(&buf);
-	return err;
-}
-
-/* Rewrite extents */
-static errcode_t rewrite_extents(ext2_filsys fs, ext2_ino_t ino)
-{
-	ext2_extent_handle_t	handle;
-	struct ext2fs_extent	extent;
-	errcode_t		errcode;
-	struct ext2_extent_info	info;
-
-	errcode = ext2fs_extent_open(fs, ino, &handle);
-	if (errcode)
-		return errcode;
-
-	errcode = ext2fs_extent_get(handle, EXT2_EXTENT_ROOT, &extent);
-	if (errcode)
-		goto out;
-
-	do {
-		errcode = ext2fs_extent_get_info(handle, &info);
-		if (errcode)
-			break;
-
-		/*
-		 * If this is the first extent in an extent block that we
-		 * haven't visited, rewrite the extent to force the ETB
-		 * checksum to be rewritten.
-		 */
-		if (info.curr_entry == 1 && info.curr_level != 0 &&
-		    !(extent.e_flags & EXT2_EXTENT_FLAGS_SECOND_VISIT)) {
-			errcode = ext2fs_extent_replace(handle, 0, &extent);
-			if (errcode)
-				break;
-		}
-
-		/* Skip to the end of a block of leaf nodes */
-		if (extent.e_flags & EXT2_EXTENT_FLAGS_LEAF) {
-			errcode = ext2fs_extent_get(handle,
-						    EXT2_EXTENT_LAST_SIB,
-						    &extent);
-			if (errcode)
-				break;
-		}
-
-		errcode = ext2fs_extent_get(handle, EXT2_EXTENT_NEXT, &extent);
-	} while (errcode == 0);
-
-out:
-	/* Ok if we run off the end */
-	if (errcode == EXT2_ET_EXTENT_NO_NEXT)
-		errcode = 0;
-	ext2fs_extent_free(handle);
-	return errcode;
-}
-
-static void quiet_com_err_proc(const char *whoami, errcode_t code,
-			       const char *fmt, va_list args)
-{
-}
-
-static errcode_t inode_scan_and_fix(ext2_resize_t rfs)
-{
-	struct process_block_struct	pb;
-	ext2_ino_t		ino, new_inode;
-	struct ext2_inode 	*inode = NULL;
-	ext2_inode_scan 	scan = NULL;
-	errcode_t		retval;
-	char			*block_buf = 0;
-	ext2_ino_t		start_to_move;
-	int			inode_size;
-
-	if ((rfs->old_fs->group_desc_count <=
-	     rfs->new_fs->group_desc_count) &&
-	    !rfs->bmap)
-		return 0;
-
-	set_com_err_hook(quiet_com_err_proc);
-
-	retval = ext2fs_open_inode_scan(rfs->old_fs, 0, &scan);
-	if (retval) goto errout;
-
-	retval = ext2fs_init_dblist(rfs->old_fs, 0);
-	if (retval) goto errout;
-	retval = ext2fs_get_array(rfs->old_fs->blocksize, 3, &block_buf);
-	if (retval) goto errout;
-
-	start_to_move = (rfs->new_fs->group_desc_count *
-			 rfs->new_fs->super->s_inodes_per_group);
-
-	if (rfs->progress) {
-		retval = (rfs->progress)(rfs, E2_RSZ_INODE_SCAN_PASS,
-					 0, rfs->old_fs->group_desc_count);
+	if (old_fs->desc_blocks != fs->desc_blocks) {
+		retval = ext2fs_resize_mem(old_fs->desc_blocks *
+					   fs->blocksize,
+					   fs->desc_blocks * fs->blocksize,
+					   &fs->group_desc);
 		if (retval)
 			goto errout;
+		if (fs->desc_blocks > old_fs->desc_blocks)
+			memset((char *) fs->group_desc +
+			       (old_fs->desc_blocks * fs->blocksize), 0,
+			       (fs->desc_blocks - old_fs->desc_blocks) *
+			       fs->blocksize);
 	}
-	ext2fs_set_inode_callback(scan, progress_callback, (void *) rfs);
-	pb.rfs = rfs;
-	pb.inode = inode;
-	pb.error = 0;
-	new_inode = EXT2_FIRST_INODE(rfs->new_fs->super);
-	inode_size = EXT2_INODE_SIZE(rfs->new_fs->super);
-	inode = malloc(inode_size);
-	if (!inode) {
-		retval = ENOMEM;
-		goto errout;
-	}
+
 	/*
-	 * First, copy all of the inodes that need to be moved
-	 * elsewhere in the inode table
+	 * If the resize_inode feature is set, and we are changing the
+	 * number of descriptor blocks, then adjust
+	 * s_reserved_gdt_blocks if possible to avoid needing to move
+	 * the inode table either now or in the future.
 	 */
-	while (1) {
-		retval = ext2fs_get_next_inode_full(scan, &ino, inode, inode_size);
-		if (retval) goto errout;
-		if (!ino)
-			break;
-
-		if (inode->i_links_count == 0 && ino != EXT2_RESIZE_INO)
-			continue; /* inode not in use */
-
-		pb.is_dir = LINUX_S_ISDIR(inode->i_mode);
-		pb.changed = 0;
-
-		/* Remap EA block */
-		retval = migrate_ea_block(rfs, ino, inode, &pb.changed);
-		if (retval)
-			goto errout;
-
-		new_inode = ino;
-		if (ino <= start_to_move)
-			goto remap_blocks; /* Don't need to move inode. */
-
-		/*
-		 * Find a new inode.  Now that extents and directory blocks
-		 * are tied to the inode number through the checksum, we must
-		 * set up the new inode before we start rewriting blocks.
-		 */
-		retval = ext2fs_new_inode(rfs->new_fs, 0, 0, 0, &new_inode);
-		if (retval)
-			goto errout;
-
-		ext2fs_inode_alloc_stats2(rfs->new_fs, new_inode, +1,
-					  pb.is_dir);
-		inode->i_ctime = time(0);
-		retval = ext2fs_write_inode_full(rfs->old_fs, new_inode,
-						inode, inode_size);
-		if (retval)
-			goto errout;
-		pb.changed = 0;
-
-#ifdef RESIZE2FS_DEBUG
-		if (rfs->flags & RESIZE_DEBUG_INODEMAP)
-			printf("Inode moved %u->%u\n", ino, new_inode);
-#endif
-		if (!rfs->imap) {
-			retval = ext2fs_create_extent_table(&rfs->imap, 0);
-			if (retval)
-				goto errout;
-		}
-		ext2fs_add_extent_entry(rfs->imap, ino, new_inode);
+	adjust_reserved_gdt_blocks(old_fs, fs);
 
-remap_blocks:
-		if (pb.changed)
-			retval = ext2fs_write_inode_full(rfs->old_fs,
-							 new_inode,
-							 inode, inode_size);
-		if (retval)
-			goto errout;
+	if ((fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) &&
+	    (fs->super->s_first_meta_bg > fs->desc_blocks)) {
+		fs->super->s_feature_incompat &=
+			~EXT2_FEATURE_INCOMPAT_META_BG;
+		fs->super->s_first_meta_bg = 0;
+	}
 
-		/* Rewrite extent block checksums with new inode number */
-		if (EXT2_HAS_RO_COMPAT_FEATURE(rfs->old_fs->super,
-				       EXT4_FEATURE_RO_COMPAT_METADATA_CSUM) &&
-		    (inode->i_flags & EXT4_EXTENTS_FL)) {
-			rfs->old_fs->flags |= EXT2_FLAG_IGNORE_CSUM_ERRORS;
-			retval = rewrite_extents(rfs->old_fs, new_inode);
-			rfs->old_fs->flags &= ~EXT2_FLAG_IGNORE_CSUM_ERRORS;
-			if (retval)
-				goto errout;
-		}
+	/*
+	 * Update the location of the backup superblocks if the
+	 * sparse_super2 feature is enabled.
+	 */
+	if (fs->super->s_feature_compat & EXT4_FEATURE_COMPAT_SPARSE_SUPER2) {
+		dgrp_t last_bg = fs->group_desc_count - 1;
+		dgrp_t old_last_bg = old_fs->group_desc_count - 1;
 
-		/*
-		 * Update inodes to point to new blocks; schedule directory
-		 * blocks for inode remapping.  Need to write out dir blocks
-		 * with new inode numbers if we have metadata_csum enabled.
-		 */
-		if (ext2fs_inode_has_valid_blocks2(rfs->old_fs, inode) &&
-		    (rfs->bmap || pb.is_dir)) {
-			pb.ino = new_inode;
-			pb.old_ino = ino;
-			pb.has_extents = inode->i_flags & EXT4_EXTENTS_FL;
-			rfs->old_fs->flags |= EXT2_FLAG_IGNORE_CSUM_ERRORS;
-			retval = ext2fs_block_iterate3(rfs->old_fs,
-						       new_inode, 0, block_buf,
-						       process_block, &pb);
-			rfs->old_fs->flags &= ~EXT2_FLAG_IGNORE_CSUM_ERRORS;
-			if (retval)
-				goto errout;
-			if (pb.error) {
-				retval = pb.error;
-				goto errout;
-			}
-		} else if ((inode->i_flags & EXT4_INLINE_DATA_FL) &&
-			   (rfs->bmap || pb.is_dir)) {
-			/* inline data dir; update it too */
-			retval = ext2fs_add_dir_block2(rfs->old_fs->dblist,
-						       new_inode, 0, 0);
-			if (retval)
-				goto errout;
+		/* For shrinking we already did this in prepare_shrink() */
+		if (last_bg > old_last_bg) {
+			if (old_fs->group_desc_count == 1)
+				fs->super->s_backup_bgs[0] = 1;
+			if (old_fs->group_desc_count == 1 &&
+			    fs->super->s_backup_bgs[0])
+				fs->super->s_backup_bgs[0] = last_bg;
+			else if (fs->super->s_backup_bgs[1])
+				fs->super->s_backup_bgs[1] = last_bg;
 		}
 	}
-	io_channel_flush(rfs->old_fs->io);
 
 errout:
-	reset_com_err_hook();
-	if (rfs->bmap) {
-		ext2fs_free_extent_table(rfs->bmap);
-		rfs->bmap = 0;
-	}
-	if (scan)
-		ext2fs_close_inode_scan(scan);
-	if (block_buf)
-		ext2fs_free_mem(&block_buf);
-	free(inode);
 	return retval;
 }
 
-/* --------------------------------------------------------------------
- *
- * Resize processing, phase 4.
- *
- * --------------------------------------------------------------------
+/*
+ * This helper function creates a block bitmap with all of the
+ * filesystem meta-data blocks.
  */
-
-struct istruct {
-	ext2_resize_t rfs;
-	errcode_t	err;
-	unsigned int	max_dirs;
-	unsigned int	num;
-};
-
-static int check_and_change_inodes(ext2_ino_t dir,
-				   int entry EXT2FS_ATTR((unused)),
-				   struct ext2_dir_entry *dirent, int offset,
-				   int	blocksize EXT2FS_ATTR((unused)),
-				   char *buf EXT2FS_ATTR((unused)),
-				   void *priv_data)
+static errcode_t mark_table_blocks(ext2_filsys fs,
+				   ext2fs_block_bitmap bmap)
 {
-	struct istruct *is = (struct istruct *) priv_data;
-	struct ext2_inode 	inode;
-	ext2_ino_t		new_inode;
-	errcode_t		retval;
-	int			ret = 0;
-
-	if (is->rfs->progress && offset == 0) {
-		io_channel_flush(is->rfs->old_fs->io);
-		is->err = (is->rfs->progress)(is->rfs,
-					      E2_RSZ_INODE_REF_UPD_PASS,
-					      ++is->num, is->max_dirs);
-		if (is->err)
-			return DIRENT_ABORT;
-	}
-
-	/*
-	 * If we have checksums enabled and the inode wasn't present in the
-	 * old fs, then we must rewrite all dir blocks with new checksums.
-	 */
-	if (EXT2_HAS_RO_COMPAT_FEATURE(is->rfs->old_fs->super,
-				       EXT4_FEATURE_RO_COMPAT_METADATA_CSUM) &&
-	    !ext2fs_test_inode_bitmap2(is->rfs->old_fs->inode_map, dir))
-		ret |= DIRENT_CHANGED;
-
-	if (!dirent->inode)
-		return ret;
+	dgrp_t			i;
+	blk64_t			blk;
 
-	new_inode = ext2fs_extent_translate(is->rfs->imap, dirent->inode);
+	for (i = 0; i < fs->group_desc_count; i++) {
+		ext2fs_reserve_super_and_bgd(fs, i, bmap);
 
-	if (!new_inode)
-		return ret;
-#ifdef RESIZE2FS_DEBUG
-	if (is->rfs->flags & RESIZE_DEBUG_INODEMAP)
-		printf("Inode translate (dir=%u, name=%.*s, %u->%u)\n",
-		       dir, ext2fs_dirent_name_len(dirent), dirent->name,
-		       dirent->inode, new_inode);
-#endif
+		/*
+		 * Mark the blocks used for the inode table
+		 */
+		blk = ext2fs_inode_table_loc(fs, i);
+		if (blk)
+			ext2fs_mark_block_bitmap_range2(bmap, blk,
+						fs->inode_blocks_per_group);
 
-	dirent->inode = new_inode;
+		/*
+		 * Mark block used for the block bitmap
+		 */
+		blk = ext2fs_block_bitmap_loc(fs, i);
+		if (blk)
+			ext2fs_mark_block_bitmap2(bmap, blk);
 
-	/* Update the directory mtime and ctime */
-	retval = ext2fs_read_inode(is->rfs->old_fs, dir, &inode);
-	if (retval == 0) {
-		inode.i_mtime = inode.i_ctime = time(0);
-		is->err = ext2fs_write_inode(is->rfs->old_fs, dir, &inode);
-		if (is->err)
-			return ret | DIRENT_ABORT;
+		/*
+		 * Mark block used for the inode bitmap
+		 */
+		blk = ext2fs_inode_bitmap_loc(fs, i);
+		if (blk)
+			ext2fs_mark_block_bitmap2(bmap, blk);
 	}
-
-	return ret | DIRENT_CHANGED;
+	return 0;
 }
 
-static errcode_t inode_ref_fix(ext2_resize_t rfs)
+/*
+ * Free group descriptor blocks that aren't needed anymore when fs is shrunk
+ */
+static errcode_t free_gd_blocks(ext2_resize_t rfs)
 {
-	errcode_t		retval;
-	struct istruct 		is;
+	errcode_t	retval = 0;
+	ext2_filsys 	fs = rfs->new_fs, old_fs = rfs->old_fs;
+	blk64_t		old_blocks, new_blocks, group_end, cluster_freed;
+	ext2fs_block_bitmap	new_meta_bmap = NULL;
+	blk64_t		blk, group_blk;
+	dgrp_t		i;
+
+	if (old_fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)
+		old_blocks = old_fs->super->s_first_meta_bg;
+	else
+		old_blocks = old_fs->desc_blocks +
+			old_fs->super->s_reserved_gdt_blocks;
+	if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)
+		new_blocks = fs->super->s_first_meta_bg;
+	else
+		new_blocks = fs->desc_blocks + fs->super->s_reserved_gdt_blocks;
 
-	if (!rfs->imap)
+	if (old_blocks == new_blocks)
 		return 0;
 
-	/*
-	 * Now, we iterate over all of the directories to update the
-	 * inode references
-	 */
-	is.num = 0;
-	is.max_dirs = ext2fs_dblist_count2(rfs->old_fs->dblist);
-	is.rfs = rfs;
-	is.err = 0;
+	if (new_blocks > old_blocks) {
+		fprintf(stderr, "%s: Called when growing filesystem (%llu > "
+			"%llu)!\n", __func__, (unsigned long long)new_blocks,
+			(unsigned long long)old_blocks);
+		exit(1);
+	}
 
-	if (rfs->progress) {
-		retval = (rfs->progress)(rfs, E2_RSZ_INODE_REF_UPD_PASS,
-					 0, is.max_dirs);
+	if (EXT2FS_CLUSTER_RATIO(fs) > 1) {
+		retval = ext2fs_allocate_block_bitmap(fs,
+						_("new meta blocks"),
+						&new_meta_bmap);
 		if (retval)
 			goto errout;
-	}
 
-	rfs->old_fs->flags |= EXT2_FLAG_IGNORE_CSUM_ERRORS;
-	retval = ext2fs_dblist_dir_iterate(rfs->old_fs->dblist,
-					   DIRENT_FLAG_INCLUDE_EMPTY, 0,
-					   check_and_change_inodes, &is);
-	rfs->old_fs->flags &= ~EXT2_FLAG_IGNORE_CSUM_ERRORS;
-	if (retval)
-		goto errout;
-	if (is.err) {
-		retval = is.err;
-		goto errout;
+		retval = mark_table_blocks(fs, new_meta_bmap);
+		if (retval)
+			goto errout;
 	}
 
-	if (rfs->progress && (is.num < is.max_dirs))
-		(rfs->progress)(rfs, E2_RSZ_INODE_REF_UPD_PASS,
-				is.max_dirs, is.max_dirs);
-
+	group_blk = fs->super->s_first_data_block;
+	for (i = 0; i < fs->group_desc_count; i++) {
+		if (!ext2fs_bg_has_super(fs, i)) {
+			group_blk += fs->super->s_blocks_per_group;
+			continue;
+		}
+		group_end = group_blk + 1 + old_blocks;
+		for (blk = group_blk + 1 + new_blocks; blk < group_end;) {
+			if (new_meta_bmap == NULL ||
+			    !ext2fs_test_block_bitmap2(new_meta_bmap,
+						       blk)) {
+				cluster_freed =
+					EXT2FS_CLUSTER_RATIO(fs) -
+					(blk &
+					 EXT2FS_CLUSTER_MASK(fs));
+				if (cluster_freed > group_end - blk)
+					cluster_freed = group_end - blk;
+				ext2fs_block_alloc_stats2(fs, blk, -1);
+				blk += EXT2FS_CLUSTER_RATIO(fs);
+				continue;
+			}
+			blk++;
+		}
+		group_blk += fs->super->s_blocks_per_group;
+	}
 errout:
-	ext2fs_free_extent_table(rfs->imap);
-	rfs->imap = 0;
 	return retval;
 }
 
-
-/* --------------------------------------------------------------------
- *
- * Resize processing, phase 5.
- *
- * In this phase we actually move the inode table around, and then
- * update the summary statistics.  This is scary, since aborting here
- * will potentially scramble the filesystem.  (We are moving the
- * inode tables around in place, and so the potential for lost data,
- * or at the very least scrambling the mapping between filenames and
- * inode numbers is very high in case of a power failure here.)
- * --------------------------------------------------------------------
- */
-
-
 /*
- * A very scary routine --- this one moves the inode table around!!!
- *
- * After this you have to use the rfs->new_fs file handle to read and
- * write inodes.
+ * Identify blocks that need moving to make space for new group descriptors,
+ * move them, and mark them as used.
  */
-static errcode_t move_itables(ext2_resize_t rfs)
+static errcode_t make_space_for_gd(ext2_resize_t rfs)
 {
-	int		n, num, size;
-	long long	diff;
-	dgrp_t		i, max_groups;
-	ext2_filsys	fs = rfs->new_fs;
-	char		*cp;
-	blk64_t		old_blk, new_blk, blk, cluster_freed;
+	int		j, has_super;
+	dgrp_t		i;
+	blk64_t		blk, group_blk;
+	blk64_t		old_blocks, new_blocks;
+	unsigned int	meta_bg, meta_bg_size;
 	errcode_t	retval;
-	int		j, to_move, moved;
-	ext2fs_block_bitmap	new_bmap = NULL;
+	ext2_filsys 	fs = rfs->new_fs, old_fs = rfs->old_fs;
+	ext2fs_block_bitmap move_blocks;
+
+	retval = ext2fs_allocate_block_bitmap(fs, _("blocks to be moved"),
+					      &move_blocks);
+	if (retval)
+		return retval;
 
-	max_groups = fs->group_desc_count;
-	if (max_groups > rfs->old_fs->group_desc_count)
-		max_groups = rfs->old_fs->group_desc_count;
+	if (old_fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)
+		old_blocks = old_fs->super->s_first_meta_bg;
+	else
+		old_blocks = old_fs->desc_blocks +
+			old_fs->super->s_reserved_gdt_blocks;
+	if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)
+		new_blocks = fs->super->s_first_meta_bg;
+	else
+		new_blocks = fs->desc_blocks + fs->super->s_reserved_gdt_blocks;
 
-	size = fs->blocksize * fs->inode_blocks_per_group;
-	if (!rfs->itable_buf) {
-		retval = ext2fs_get_mem(size, &rfs->itable_buf);
-		if (retval)
-			return retval;
+	if (old_blocks == new_blocks) {
+		retval = 0;
+		goto errout;
 	}
 
-	if (EXT2FS_CLUSTER_RATIO(fs) > 1) {
-		retval = ext2fs_allocate_block_bitmap(fs, _("new meta blocks"),
-						      &new_bmap);
-		if (retval)
-			return retval;
-
-		retval = mark_table_blocks(fs, new_bmap);
-		if (retval)
-			goto errout;
+	if (new_blocks < old_blocks) {
+		fprintf(stderr, "%s: Called when shrinking filesystem (%llu < "
+			"%llu)!\n", __func__, (unsigned long long)new_blocks,
+			(unsigned long long)old_blocks);
+		exit(1);
 	}
 
+	meta_bg_size = EXT2_DESC_PER_BLOCK(fs->super);
 	/*
-	 * Figure out how many inode tables we need to move
+	 * Mark space for new descriptor blocks as needing moving. We need to
+	 * handle only groups with old style group descriptor blocks - for
+	 * groups using META_BG the number of group descriptor blocks doesn't
+	 * change.
 	 */
-	to_move = moved = 0;
-	for (i=0; i < max_groups; i++)
-		if (ext2fs_inode_table_loc(rfs->old_fs, i) !=
-		    ext2fs_inode_table_loc(fs, i))
-			to_move++;
+	group_blk = old_fs->super->s_first_data_block;
+	for (i = 0; i < old_fs->group_desc_count;
+	     i++, group_blk += fs->super->s_blocks_per_group) {
+		if (!ext2fs_bg_has_super(fs, i))
+			continue;
 
-	if (to_move == 0) {
-		retval = 0;
-		goto errout;
-	}
+		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)
+			break;
 
-	if (rfs->progress) {
-		retval = rfs->progress(rfs, E2_RSZ_MOVE_ITABLE_PASS,
-				       0, to_move);
-		if (retval)
-			goto errout;
+		ext2fs_mark_block_bitmap_range2(move_blocks,
+						group_blk + old_blocks + 1,
+						new_blocks - old_blocks);
 	}
 
-	rfs->old_fs->flags |= EXT2_FLAG_MASTER_SB_ONLY;
-
-	for (i=0; i < max_groups; i++) {
-		old_blk = ext2fs_inode_table_loc(rfs->old_fs, i);
-		new_blk = ext2fs_inode_table_loc(fs, i);
-		diff = new_blk - old_blk;
-
-#ifdef RESIZE2FS_DEBUG
-		if (rfs->flags & RESIZE_DEBUG_ITABLEMOVE)
-			printf("Itable move group %d block %llu->%llu (diff %lld)\n",
-			       i, old_blk, new_blk, diff);
-#endif
+	retval = ext2fs_move_blocks(fs, move_blocks, NULL);
+	if (retval)
+		goto errout;
 
-		if (!diff)
+	/* Blocks for group descriptors are unused now, mark them as used */
+	group_blk = old_fs->super->s_first_data_block;
+	for (i = 0; i < old_fs->group_desc_count;
+	     i++, group_blk += fs->super->s_blocks_per_group) {
+		if (!ext2fs_bg_has_super(fs, i))
 			continue;
-		if (diff < 0)
-			diff = 0;
-
-		retval = io_channel_read_blk64(fs->io, old_blk,
-					       fs->inode_blocks_per_group,
-					       rfs->itable_buf);
-		if (retval)
-			goto errout;
-		/*
-		 * The end of the inode table segment often contains
-		 * all zeros, and we're often only moving the inode
-		 * table down a block or two.  If so, we can optimize
-		 * things by not rewriting blocks that we know to be zero
-		 * already.
-		 */
-		for (cp = rfs->itable_buf+size-1, n=0; n < size; n++, cp--)
-			if (*cp)
-				break;
-		n = n >> EXT2_BLOCK_SIZE_BITS(fs->super);
-#ifdef RESIZE2FS_DEBUG
-		if (rfs->flags & RESIZE_DEBUG_ITABLEMOVE)
-			printf("%d blocks of zeros...\n", n);
-#endif
-		num = fs->inode_blocks_per_group;
-		if (n > diff)
-			num -= n;
-
-		retval = io_channel_write_blk64(fs->io, new_blk,
-						num, rfs->itable_buf);
-		if (retval) {
-			io_channel_write_blk64(fs->io, old_blk,
-					       num, rfs->itable_buf);
-			goto errout;
-		}
-		if (n > diff) {
-			retval = io_channel_write_blk64(fs->io,
-			      old_blk + fs->inode_blocks_per_group,
-			      diff, (rfs->itable_buf +
-				     (fs->inode_blocks_per_group - diff) *
-				     fs->blocksize));
-			if (retval)
-				goto errout;
-		}
-
-		for (blk = ext2fs_inode_table_loc(rfs->old_fs, i), j=0;
-		     j < fs->inode_blocks_per_group;) {
-			if (new_bmap == NULL ||
-			    !ext2fs_test_block_bitmap2(new_bmap, blk)) {
-				ext2fs_block_alloc_stats2(fs, blk, -1);
-				cluster_freed = EXT2FS_CLUSTER_RATIO(fs) -
-						(blk & EXT2FS_CLUSTER_MASK(fs));
-				blk += cluster_freed;
-				j += cluster_freed;
-				continue;
-			}
-			blk++;
-			j++;
-		}
 
-		ext2fs_inode_table_loc_set(rfs->old_fs, i, new_blk);
-		ext2fs_group_desc_csum_set(rfs->old_fs, i);
-		ext2fs_mark_super_dirty(rfs->old_fs);
-		ext2fs_flush(rfs->old_fs);
+		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)
+			break;
 
-		if (rfs->progress) {
-			retval = rfs->progress(rfs, E2_RSZ_MOVE_ITABLE_PASS,
-					       ++moved, to_move);
-			if (retval)
-				goto errout;
-		}
+		ext2fs_mark_block_bitmap_range2(fs->block_map,
+						group_blk + old_blocks + 1,
+						new_blocks - old_blocks);
 	}
-	mark_table_blocks(fs, fs->block_map);
-	ext2fs_flush(fs);
-#ifdef RESIZE2FS_DEBUG
-	if (rfs->flags & RESIZE_DEBUG_ITABLEMOVE)
-		printf("Inode table move finished.\n");
-#endif
-	retval = 0;
-
 errout:
-	if (new_bmap)
-		ext2fs_free_block_bitmap(new_bmap);
+	if (move_blocks)
+		ext2fs_free_block_bitmap(move_blocks);
 	return retval;
 }
 
@@ -2134,102 +1020,6 @@ static errcode_t clear_sparse_super2_last_group(ext2_resize_t rfs)
 }
 
 /*
- * This function is used when shrinking a file system.  We need to
- * utilize blocks from what will be the new last block group for the
- * backup superblock and block group descriptor blocks.
- * Unfortunately, those blocks may be used by other files or fs
- * metadata blocks.  We need to mark them as being in use.
- */
-static errcode_t reserve_sparse_super2_last_group(ext2_resize_t rfs,
-						 ext2fs_block_bitmap meta_bmap)
-{
-	ext2_filsys	fs = rfs->new_fs;
-	ext2_filsys	old_fs = rfs->old_fs;
-	errcode_t	retval;
-	dgrp_t		old_last_bg = rfs->old_fs->group_desc_count - 1;
-	dgrp_t		last_bg = fs->group_desc_count - 1;
-	dgrp_t		g;
-	blk64_t		blk, sb, old_desc;
-	blk_t		i, num;
-	int		realloc = 0;
-
-	if (!(fs->super->s_feature_compat & EXT4_FEATURE_COMPAT_SPARSE_SUPER2))
-		return 0;
-
-	if (last_bg >= old_last_bg)
-		return 0;
-
-	if (fs->super->s_backup_bgs[0] == old_fs->super->s_backup_bgs[0] &&
-	    fs->super->s_backup_bgs[1] == old_fs->super->s_backup_bgs[1])
-		return 0;
-
-	if (fs->super->s_backup_bgs[0] != last_bg &&
-	    fs->super->s_backup_bgs[1] != last_bg)
-		return 0;
-
-	if (old_fs->super->s_backup_bgs[0] == last_bg ||
-	    old_fs->super->s_backup_bgs[1] == last_bg)
-		return 0;
-
-	retval = ext2fs_super_and_bgd_loc2(rfs->new_fs, last_bg,
-					   &sb, &old_desc, NULL, &num);
-	if (retval)
-		return retval;
-
-	if (last_bg && !sb) {
-		fputs(_("Should never happen!  No sb in last super_sparse bg?\n"),
-		      stderr);
-		exit(1);
-	}
-	if (old_desc && old_desc != sb+1) {
-		fputs(_("Should never happen!  Unexpected old_desc in "
-			"super_sparse bg?\n"),
-		      stderr);
-		exit(1);
-	}
-	num = (old_desc) ? num : 1;
-
-	/* Reserve the backup blocks */
-	ext2fs_mark_block_bitmap_range2(fs->block_map, sb, num);
-
-	for (g = 0; g < fs->group_desc_count; g++) {
-		blk64_t mb;
-
-		mb = ext2fs_block_bitmap_loc(fs, g);
-		if ((mb >= sb) && (mb < sb + num)) {
-			ext2fs_block_bitmap_loc_set(fs, g, 0);
-			realloc = 1;
-		}
-		mb = ext2fs_inode_bitmap_loc(fs, g);
-		if ((mb >= sb) && (mb < sb + num)) {
-			ext2fs_inode_bitmap_loc_set(fs, g, 0);
-			realloc = 1;
-		}
-		mb = ext2fs_inode_table_loc(fs, g);
-		if ((mb < sb + num) &&
-		    (sb < mb + fs->inode_blocks_per_group)) {
-			ext2fs_inode_table_loc_set(fs, g, 0);
-			realloc = 1;
-		}
-		if (realloc) {
-			retval = ext2fs_allocate_group_table(fs, g, 0);
-			if (retval)
-				return retval;
-		}
-	}
-
-	for (blk = sb, i = 0; i < num; blk++, i++) {
-		if (ext2fs_test_block_bitmap2(old_fs->block_map, blk) &&
-		    !ext2fs_test_block_bitmap2(meta_bmap, blk)) {
-			ext2fs_mark_block_bitmap2(rfs->move_blocks, blk);
-			rfs->needed_blocks++;
-		}
-		ext2fs_mark_block_bitmap2(rfs->reserve_blocks, blk);
-	}
-	return 0;
-}
-
-/*
  * Fix the resize inode
  */
 static errcode_t fix_resize_inode(ext2_filsys fs)
@@ -2354,33 +1144,6 @@ static errcode_t ext2fs_calculate_summary_stats(ext2_filsys fs)
 	return 0;
 }
 
-/*
- *  Journal may have been relocated; update the backup journal blocks
- *  in the superblock.
- */
-static errcode_t fix_sb_journal_backup(ext2_filsys fs)
-{
-	errcode_t	  retval;
-	struct ext2_inode inode;
-
-	if (!(fs->super->s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL))
-		return 0;
-
-	/* External journal? Nothing to do. */
-	if (fs->super->s_journal_dev && !fs->super->s_journal_inum)
-		return 0;
-
-	retval = ext2fs_read_inode(fs, fs->super->s_journal_inum, &inode);
-	if (retval)
-		return retval;
-	memcpy(fs->super->s_jnl_blocks, inode.i_block, EXT2_N_BLOCKS*4);
-	fs->super->s_jnl_blocks[15] = inode.i_size_high;
-	fs->super->s_jnl_blocks[16] = inode.i_size;
-	fs->super->s_jnl_backup_type = EXT3_JNL_BACKUP_BLOCKS;
-	ext2fs_mark_super_dirty(fs);
-	return 0;
-}
-
 static int calc_group_overhead(ext2_filsys fs, blk64_t grp,
 			       int old_desc_blocks)
 {
diff --git a/resize/resize2fs.h b/resize/resize2fs.h
index c53b3bee8c8d..c5d9c92c58ca 100644
--- a/resize/resize2fs.h
+++ b/resize/resize2fs.h
@@ -107,19 +107,7 @@ typedef struct ext2_resize_struct *ext2_resize_t;
 struct ext2_resize_struct {
 	ext2_filsys	old_fs;
 	ext2_filsys	new_fs;
-	ext2fs_block_bitmap reserve_blocks;
-	ext2fs_block_bitmap move_blocks;
-	ext2_extent	bmap;
-	ext2_extent	imap;
-	blk64_t		needed_blocks;
 	int		flags;
-	char		*itable_buf;
-
-	/*
-	 * For the block allocator
-	 */
-	blk64_t		new_blk;
-	int		alloc_state;
 
 	/*
 	 * For the progress meter
@@ -146,9 +134,10 @@ extern errcode_t resize_fs(ext2_filsys fs, blk64_t *new_size, int flags,
 					    int pass, unsigned long cur,
 					    unsigned long max));
 
+extern errcode_t validate_fs_size(ext2_filsys fs, blk64_t *new_sizep);
 extern errcode_t adjust_fs_info(ext2_filsys fs, ext2_filsys old_fs,
-				ext2fs_block_bitmap reserve_blocks,
 				blk64_t new_size);
+extern errcode_t alloc_new_groups(ext2_filsys fs, dgrp_t from);
 extern blk64_t calculate_minimum_resize_size(ext2_filsys fs, int flags);
 
 
diff --git a/tests/r_expand_full/expect b/tests/r_expand_full/expect
index c80baa265e76..bfb8456eebee 100644
--- a/tests/r_expand_full/expect
+++ b/tests/r_expand_full/expect
@@ -27,20 +27,20 @@ Change in FS metadata:
  group:block:super:gdt:bbitmap:ibitmap:itable
 -0:1:1:2-4:5:6:7
 -1:8193:8193:8194-8196:8197:8198:8199
-+0:1:1:2-13:263:264:265
-+1:8193:8193:8194-8205:8455:8456:8457
++0:1:1:2-13:14:15:16
++1:8193:8193:8194-8205:8206:8207:8208
  2:16385:-1:-1:16385:16386:16387
 -3:24577:24577:24578-24580:24581:24582:24583
-+3:24577:24577:24578-24589:24839:24840:24841
++3:24577:24577:24578-24589:24590:24591:24592
  4:32769:-1:-1:32769:32770:32771
 -5:40961:40961:40962-40964:40965:40966:40967
-+5:40961:40961:40962-40973:41223:41224:41225
++5:40961:40961:40962-40973:40974:40975:40976
  6:49153:-1:-1:49153:49154:49155
 -7:57345:57345:57346-57348:57349:57350:57351
-+7:57345:57345:57346-57357:57607:57608:57609
++7:57345:57345:57346-57357:57358:57359:57360
  8:65537:-1:-1:65537:65538:65539
 -9:73729:73729:73730-73732:73733:73734:73735
-+9:73729:73729:73730-73741:73991:73992:73993
++9:73729:73729:73730-73741:73742:73743:73744
  10:81921:-1:-1:81921:81922:81923
  11:90113:-1:-1:90113:90114:90115
  12:98305:-1:-1:98305:98306:98307
@@ -49,10 +49,10 @@ Change in FS metadata:
  23:188417:-1:-1:188417:188418:188419
  24:196609:-1:-1:196609:196610:196611
 -25:204801:204801:204802-204804:204805:204806:204807
-+25:204801:204801:204802-204813:205063:205064:205065
++25:204801:204801:204802-204813:204814:204815:204816
  26:212993:-1:-1:212993:212994:212995
 -27:221185:221185:221186-221188:221189:221190:221191
-+27:221185:221185:221186-221197:221447:221448:221449
++27:221185:221185:221186-221197:221198:221199:221200
  28:229377:-1:-1:229377:229378:229379
  29:237569:-1:-1:237569:237570:237571
  30:245761:-1:-1:245761:245762:245763
@@ -61,7 +61,7 @@ Change in FS metadata:
  47:385025:-1:-1:385025:385026:385027
  48:393217:-1:-1:393217:393218:393219
 -49:401409:401409:401410-401412:401413:401414:401415
-+49:401409:401409:401410-401421:401671:401672:401673
++49:401409:401409:401410-401421:401422:401423:401424
  50:409601:-1:-1:409601:409602:409603
  51:417793:-1:-1:417793:417794:417795
  52:425985:-1:-1:425985:425986:425987
@@ -70,7 +70,7 @@ Change in FS metadata:
  79:647169:-1:-1:647169:647170:647171
  80:655361:-1:-1:655361:655362:655363
 -81:663553:663553:663554-663556:663557:663558:663559
-+81:663553:663553:663554-663565:663815:663816:663817
++81:663553:663553:663554-663565:663566:663567:663568
  82:671745:-1:-1:671745:671746:671747
  83:679937:-1:-1:679937:679938:679939
  84:688129:-1:-1:688129:688130:688131
diff --git a/tests/t_32to64bit_expand_full/expect b/tests/t_32to64bit_expand_full/expect
index 2093c1df2e46..a0991696c872 100644
--- a/tests/t_32to64bit_expand_full/expect
+++ b/tests/t_32to64bit_expand_full/expect
@@ -28,20 +28,20 @@ Change in FS metadata:
  group:block:super:gdt:bbitmap:ibitmap:itable
 -0:1:1:2-7:8:9:10
 -1:8193:8193:8194-8199:8200:8201:8202
-+0:1:1:2-10:266:267:268
-+1:8193:8193:8194-8202:8458:8459:8460
++0:1:1:2-10:11:12:13
++1:8193:8193:8194-8202:8203:8204:8205
  2:16385:-1:-1:16385:16386:16387
 -3:24577:24577:24578-24583:24584:24585:24586
-+3:24577:24577:24578-24586:24842:24843:24844
++3:24577:24577:24578-24586:24587:24588:24589
  4:32769:-1:-1:32769:32770:32771
 -5:40961:40961:40962-40967:40968:40969:40970
-+5:40961:40961:40962-40970:41226:41227:41228
++5:40961:40961:40962-40970:40971:40972:40973
  6:49153:-1:-1:49153:49154:49155
 -7:57345:57345:57346-57351:57352:57353:57354
-+7:57345:57345:57346-57354:57610:57611:57612
++7:57345:57345:57346-57354:57355:57356:57357
  8:65537:-1:-1:65537:65538:65539
 -9:73729:73729:73730-73735:73736:73737:73738
-+9:73729:73729:73730-73738:73994:73995:73996
++9:73729:73729:73730-73738:73739:73740:73741
  10:81921:-1:-1:81921:81922:81923
  11:90113:-1:-1:90113:90114:90115
  12:98305:-1:-1:98305:98306:98307
@@ -50,10 +50,10 @@ Change in FS metadata:
  23:188417:-1:-1:188417:188418:188419
  24:196609:-1:-1:196609:196610:196611
 -25:204801:204801:204802-204807:204808:204809:204810
-+25:204801:204801:204802-204810:205066:205067:205068
++25:204801:204801:204802-204810:204811:204812:204813
  26:212993:-1:-1:212993:212994:212995
 -27:221185:221185:221186-221191:221192:221193:221194
-+27:221185:221185:221186-221194:221450:221451:221452
++27:221185:221185:221186-221194:221195:221196:221197
  28:229377:-1:-1:229377:229378:229379
  29:237569:-1:-1:237569:237570:237571
  30:245761:-1:-1:245761:245762:245763
@@ -62,7 +62,7 @@ Change in FS metadata:
  47:385025:-1:-1:385025:385026:385027
  48:393217:-1:-1:393217:393218:393219
 -49:401409:401409:401410-401415:401416:401417:401418
-+49:401409:401409:401410-401418:401674:401675:401676
++49:401409:401409:401410-401418:401419:401420:401421
  50:409601:-1:-1:409601:409602:409603
  51:417793:-1:-1:417793:417794:417795
  52:425985:-1:-1:425985:425986:425987
@@ -71,7 +71,7 @@ Change in FS metadata:
  79:647169:-1:-1:647169:647170:647171
  80:655361:-1:-1:655361:655362:655363
 -81:663553:663553:663554-663559:663560:663561:663562
-+81:663553:663553:663554-663562:663818:663819:663820
++81:663553:663553:663554-663562:663563:663564:663565
  82:671745:-1:-1:671745:671746:671747
  83:679937:-1:-1:679937:679938:679939
  84:688129:-1:-1:688129:688130:688131
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Powered by blists - more mailing lists