libext2fs: create generic numeric progress meters and use them

With 64-bit file systems, mke2fs can take a long time to do things
other than write inode tables.  I exported the mke2fs numeric progress
meter and used it for allocating group tables and the final file
system flush.

Signed-off-by: Valerie Aurora (Henson) <vaurora@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

15 files changed, 173 insertions, 88 deletions

diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
index d6ba05b0..9dbe5f2e 100644
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@ -67,6 +67,7 @@ OBJS= $(DEBUGFS_LIB_OBJS) $(RESIZE_LIB_OBJS) $(E2IMAGE_LIB_OBJS) \
 	native.o \
 	newdir.o \
 	openfs.o \
+	progress.o \
 	read_bb.o \
 	read_bb_file.o \
 	res_gdt.o \
diff --git a/lib/ext2fs/alloc_tables.c b/lib/ext2fs/alloc_tables.c
index a72cac62..952bbcc7 100644
--- a/lib/ext2fs/alloc_tables.c
+++ b/lib/ext2fs/alloc_tables.c
@@ -26,6 +26,7 @@
 
 #include "ext2_fs.h"
 #include "ext2fs.h"
+#include "ext2fsP.h"
 
 /*
  * This routine searches for free blocks that can allocate a full
@@ -219,12 +220,18 @@ errcode_t ext2fs_allocate_tables(ext2_filsys fs)
 {
 	errcode_t	retval;
 	dgrp_t		i;
+	struct ext2fs_numeric_progress_struct progress;
+
+	ext2fs_numeric_progress_init(fs, &progress, NULL,
+				     fs->group_desc_count);
 
 	for (i = 0; i < fs->group_desc_count; i++) {
+		ext2fs_numeric_progress_update(fs, &progress, i);
 		retval = ext2fs_allocate_group_table(fs, i, fs->block_map);
 		if (retval)
 			return retval;
 	}
+	ext2fs_numeric_progress_close(fs, &progress, NULL);
 	return 0;
 }
 
diff --git a/lib/ext2fs/closefs.c b/lib/ext2fs/closefs.c
index 2cf8a8bb..613908b4 100644
--- a/lib/ext2fs/closefs.c
+++ b/lib/ext2fs/closefs.c
@@ -261,7 +261,6 @@ static errcode_t write_backup_super(ext2_filsys fs, dgrp_t group,
 				    super_shadow);
 }
 
-
 errcode_t ext2fs_flush(ext2_filsys fs)
 {
 	dgrp_t		i;
@@ -276,6 +275,7 @@ errcode_t ext2fs_flush(ext2_filsys fs)
 #endif
 	char	*group_ptr;
 	int	old_desc_blocks;
+	struct ext2fs_numeric_progress_struct progress;
 
 	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
 
@@ -337,9 +337,14 @@ errcode_t ext2fs_flush(ext2_filsys fs)
 	else
 		old_desc_blocks = fs->desc_blocks;
 
+	ext2fs_numeric_progress_init(fs, &progress, NULL,
+				     fs->group_desc_count);
+
+
 	for (i = 0; i < fs->group_desc_count; i++) {
 		blk64_t	super_blk, old_desc_blk, new_desc_blk;
 
+		ext2fs_numeric_progress_update(fs, &progress, i);
 		ext2fs_super_and_bgd_loc2(fs, i, &super_blk, &old_desc_blk,
 					 &new_desc_blk, 0);
 
@@ -368,6 +373,8 @@ errcode_t ext2fs_flush(ext2_filsys fs)
 		}
 	}
 
+	ext2fs_numeric_progress_close(fs, &progress, NULL);
+
 	/*
 	 * If the write_bitmaps() function is present, call it to
 	 * flush the bitmaps.  This is done this way so that a simple
diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index 20c20053..488fb6df 100644
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -174,6 +174,7 @@ typedef struct ext2_file *ext2_file_t;
 #define EXT2_FLAG_SOFTSUPP_FEATURES	0x8000
 #define EXT2_FLAG_NOFREE_ON_ERROR	0x10000
 #define EXT2_FLAG_64BITS		0x20000
+#define EXT2_FLAG_PRINT_PROGRESS	0x40000
 
 /*
  * Special flag in the ext2 inode i_flag field that means that this is
diff --git a/lib/ext2fs/ext2fsP.h b/lib/ext2fs/ext2fsP.h
index 2ec091ef..300e4425 100644
--- a/lib/ext2fs/ext2fsP.h
+++ b/lib/ext2fs/ext2fsP.h
@@ -85,6 +85,23 @@ extern int ext2fs_process_dir_block(ext2_filsys  	fs,
 				    int			ref_offset,
 				    void		*priv_data);
 
+/* Generic numeric progress meter */
+
+struct ext2fs_numeric_progress_struct {
+	__u64		max;
+	int		log_max;
+	int		skip_progress;
+};
+
+extern void ext2fs_numeric_progress_init(ext2_filsys fs,
+					 struct ext2fs_numeric_progress_struct * progress,
+					 const char *label, __u64 max);
+extern void ext2fs_numeric_progress_update(ext2_filsys fs,
+					   struct ext2fs_numeric_progress_struct * progress,
+					   __u64 val);
+extern void ext2fs_numeric_progress_close(ext2_filsys fs,
+					  struct ext2fs_numeric_progress_struct * progress,
+					  const char *message);
 
 /*
  * 64-bit bitmap support
diff --git a/lib/ext2fs/progress.c b/lib/ext2fs/progress.c
new file mode 100644
index 00000000..5ad2a454
--- /dev/null
+++ b/lib/ext2fs/progress.c
@@ -0,0 +1,88 @@
+/*
+ * progress.c - Numeric progress meter
+ *
+ * Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+ * 	2003, 2004, 2005 by Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
+ * %End-Header%
+ */
+
+#include "ext2fs.h"
+#include "ext2fsP.h"
+
+static char spaces[80], backspaces[80];
+
+static int int_log10(unsigned int arg)
+{
+	int	l;
+
+	for (l=0; arg ; l++)
+		arg = arg / 10;
+	return l;
+}
+
+void ext2fs_numeric_progress_init(ext2_filsys fs,
+				  struct ext2fs_numeric_progress_struct * progress,
+				  const char *label, __u64 max)
+{
+	/*
+	 * The PRINT_PROGRESS flag turns on or off ALL
+	 * progress-related messages, whereas the SKIP_PROGRESS
+	 * environment variable prints the start and end messages but
+	 * not the numeric countdown in the middle.
+	 */
+	if (!(fs->flags & EXT2_FLAG_PRINT_PROGRESS))
+		return;
+
+	memset(spaces, ' ', sizeof(spaces)-1);
+	spaces[sizeof(spaces)-1] = 0;
+	memset(backspaces, '\b', sizeof(backspaces)-1);
+	spaces[sizeof(backspaces)-1] = 0;
+	progress->skip_progress = 0;
+	if (getenv("E2FSPROGS_SKIP_PROGRESS"))
+		progress->skip_progress++;
+
+	memset(progress, 0, sizeof(*progress));
+
+	/*
+	 * Figure out how many digits we need
+	 */
+	progress->max = max;
+	progress->log_max = int_log10(max);
+
+	if (label) {
+		fputs(label, stdout);
+		fflush(stdout);
+	}
+}
+
+void ext2fs_numeric_progress_update(ext2_filsys fs,
+				    struct ext2fs_numeric_progress_struct * progress,
+				    __u64 val)
+{
+	if (!(fs->flags & EXT2_FLAG_PRINT_PROGRESS))
+		return;
+	if (progress->skip_progress)
+		return;
+
+	printf("%*llu/%*llu", progress->log_max, val,
+	       progress->log_max, progress->max);
+	fprintf(stdout, "%.*s", (2*progress->log_max)+1, backspaces);
+}
+
+void ext2fs_numeric_progress_close(ext2_filsys fs,
+				   struct ext2fs_numeric_progress_struct * progress,
+				   const char *message)
+{
+	unsigned int len;
+
+	if (!(fs->flags & EXT2_FLAG_PRINT_PROGRESS))
+		return;
+	fprintf(stdout, "%.*s", (2*progress->log_max)+1, spaces);
+	fprintf(stdout, "%.*s", (2*progress->log_max)+1, backspaces);
+	if (message)
+		fputs(message, stdout);
+}
diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index ff02d398..7287181e 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -51,6 +51,7 @@ extern int optind;
 #include <limits.h>
 
 #include "ext2fs/ext2_fs.h"
+#include "ext2fs/ext2fsP.h"
 #include "et/com_err.h"
 #include "uuid/uuid.h"
 #include "e2p/e2p.h"
@@ -294,75 +295,20 @@ _("Warning: the backup superblock/group descriptors at block %u contain\n"
 	ext2fs_badblocks_list_iterate_end(bb_iter);
 }
 
-/*
- * These functions implement a generalized progress meter.
- */
-struct progress_struct {
-	char		format[20];
-	char		backup[80];
-	__u32		max;
-	int		skip_progress;
-};
-
-static void progress_init(struct progress_struct *progress,
-			  const char *label,__u32 max)
-{
-	int	i;
-
-	memset(progress, 0, sizeof(struct progress_struct));
-	if (quiet)
-		return;
-
-	/*
-	 * Figure out how many digits we need
-	 */
-	i = int_log10(max);
-	sprintf(progress->format, "%%%dd/%%%dld", i, i);
-	memset(progress->backup, '\b', sizeof(progress->backup)-1);
-	progress->backup[sizeof(progress->backup)-1] = 0;
-	if ((2*i)+1 < (int) sizeof(progress->backup))
-		progress->backup[(2*i)+1] = 0;
-	progress->max = max;
-
-	progress->skip_progress = 0;
-	if (getenv("MKE2FS_SKIP_PROGRESS"))
-		progress->skip_progress++;
-
-	fputs(label, stdout);
-	fflush(stdout);
-}
-
-static void progress_update(struct progress_struct *progress, __u32 val)
-{
-	if ((progress->format[0] == 0) || progress->skip_progress)
-		return;
-	printf(progress->format, val, progress->max);
-	fputs(progress->backup, stdout);
-}
-
-static void progress_close(struct progress_struct *progress)
-{
-	if (progress->format[0] == 0)
-		return;
-	fputs(_("done                            \n"), stdout);
-}
-
 static void write_inode_tables(ext2_filsys fs, int lazy_flag)
 {
 	errcode_t	retval;
 	blk_t		blk;
 	dgrp_t		i;
 	int		num, ipb;
-	struct progress_struct progress;
+	struct ext2fs_numeric_progress_struct progress;
 
-	if (quiet)
-		memset(&progress, 0, sizeof(progress));
-	else
-		progress_init(&progress, _("Writing inode tables: "),
-			      fs->group_desc_count);
+	ext2fs_numeric_progress_init(fs, &progress,
+				     _("Writing inode tables: "),
+				     fs->group_desc_count);
 
 	for (i = 0; i < fs->group_desc_count; i++) {
-		progress_update(&progress, i);
+		ext2fs_numeric_progress_update(fs, &progress, i);
 
 		blk = fs->group_desc[i].bg_inode_table;
 		num = fs->inode_blocks_per_group;
@@ -394,7 +340,8 @@ static void write_inode_tables(ext2_filsys fs, int lazy_flag)
 		}
 	}
 	ext2fs_zero_blocks(0, 0, 0, 0, 0);
-	progress_close(&progress);
+	ext2fs_numeric_progress_close(fs, &progress,
+				      _("done                            \n"));
 }
 
 static void create_root_dir(ext2_filsys fs)
@@ -538,7 +485,7 @@ static void zap_sector(ext2_filsys fs, int sect, int nsect)
 
 static void create_journal_dev(ext2_filsys fs)
 {
-	struct progress_struct progress;
+	struct ext2fs_numeric_progress_struct progress;
 	errcode_t		retval;
 	char			*buf;
 	blk_t			blk, err_blk;
@@ -551,12 +498,9 @@ static void create_journal_dev(ext2_filsys fs)
 			_("while initializing journal superblock"));
 		exit(1);
 	}
-	if (quiet)
-		memset(&progress, 0, sizeof(progress));
-	else
-		progress_init(&progress, _("Zeroing journal device: "),
-			      fs->super->s_blocks_count);
-
+	ext2fs_numeric_progress_init(fs, &progress,
+				     _("Zeroing journal device: "),
+				     ext2fs_blocks_count(fs->super));
 	blk = 0;
 	count = fs->super->s_blocks_count;
 	while (count > 0) {
@@ -574,7 +518,7 @@ static void create_journal_dev(ext2_filsys fs)
 		}
 		blk += c;
 		count -= c;
-		progress_update(&progress, blk);
+		ext2fs_numeric_progress_update(fs, &progress, blk);
 	}
 	ext2fs_zero_blocks(0, 0, 0, 0, 0);
 
@@ -586,7 +530,7 @@ static void create_journal_dev(ext2_filsys fs)
 			_("while writing journal superblock"));
 		exit(1);
 	}
-	progress_close(&progress);
+	ext2fs_numeric_progress_close(fs, &progress, NULL);
 }
 
 static void show_stats(ext2_filsys fs)
@@ -1895,11 +1839,19 @@ int main (int argc, char *argv[])
 			    &old_bitmaps);
 	if (!old_bitmaps)
 		flags |= EXT2_FLAG_64BITS;
+	/*
+	 * By default, we print how many inode tables or block groups
+	 * or whatever we've written so far.  The quiet flag disables
+	 * this, along with a lot of other output.
+	 */
+	if (!quiet)
+		flags |= EXT2_FLAG_PRINT_PROGRESS;
 	retval = ext2fs_initialize(device_name, flags, &fs_param, io_ptr, &fs);
 	if (retval) {
 		com_err(device_name, retval, _("while setting up superblock"));
 		exit(1);
 	}
+
 	sprintf(tdb_string, "tdb_data_size=%d", fs->blocksize <= 4096 ?
 		32768 : fs->blocksize * 8);
 	io_channel_set_options(fs->io, tdb_string);
@@ -2007,12 +1959,16 @@ int main (int argc, char *argv[])
 
 	handle_bad_blocks(fs, bb_list);
 	fs->stride = fs_stride = fs->super->s_raid_stride;
+	if (!quiet)
+		printf(_("Allocating group tables: "));
 	retval = ext2fs_allocate_tables(fs);
 	if (retval) {
 		com_err(program_name, retval,
 			_("while trying to allocate filesystem tables"));
 		exit(1);
 	}
+	if (!quiet)
+		printf(_("done                            \n"));
 	if (super_only) {
 		fs->super->s_state |= EXT2_ERROR_FS;
 		fs->flags &= ~(EXT2_FLAG_IB_DIRTY|EXT2_FLAG_BB_DIRTY);
diff --git a/tests/f_resize_inode/expect b/tests/f_resize_inode/expect
index bd45575a..8844647d 100644
--- a/tests/f_resize_inode/expect
+++ b/tests/f_resize_inode/expect
@@ -13,8 +13,9 @@ Maximum filesystem blocks=8421376
 Superblock backups stored on blocks: 
 	1025, 3073, 5121, 7169, 9217
 
-Writing inode tables:  0/16 1/16 2/16 3/16 4/16 5/16 6/16 7/16 8/16 9/1610/1611/1612/1613/1614/1615/16done                            
-Writing superblocks and filesystem accounting information: done
+Allocating group tables:  0/16 1/16 2/16 3/16 4/16 5/16 6/16 7/16 8/16 9/1610/1611/1612/1613/1614/1615/16     done                            
+Writing inode tables:  0/16 1/16 2/16 3/16 4/16 5/16 6/16 7/16 8/16 9/1610/1611/1612/1613/1614/1615/16     done                            
+Writing superblocks and filesystem accounting information:  0/16 1/16 2/16 3/16 4/16 5/16 6/16 7/16 8/16 9/1610/1611/1612/1613/1614/1615/16     done
 
 Pass 1: Checking inodes, blocks, and sizes
 Pass 2: Checking directory structure
diff --git a/tests/m_dasd_bs/expect.1 b/tests/m_dasd_bs/expect.1
index 9bc8a856..a3b4465d 100644
--- a/tests/m_dasd_bs/expect.1
+++ b/tests/m_dasd_bs/expect.1
@@ -12,8 +12,9 @@ Maximum filesystem blocks=33554432
 Superblock backups stored on blocks: 
 	16384
 
-Writing inode tables: done                            
-Writing superblocks and filesystem accounting information: done
+Allocating group tables: 0/21/2   done                            
+Writing inode tables: 0/21/2   done                            
+Writing superblocks and filesystem accounting information: 0/21/2   done
 
 Filesystem features: ext_attr resize_inode dir_index filetype sparse_super
  
diff --git a/tests/m_large_file/expect.1 b/tests/m_large_file/expect.1
index abf2d997..647e7af2 100644
--- a/tests/m_large_file/expect.1
+++ b/tests/m_large_file/expect.1
@@ -10,8 +10,9 @@ Maximum filesystem blocks=16777216
 32768 blocks per group, 32768 fragments per group
 64 inodes per group
 
-Writing inode tables: done                            
-Writing superblocks and filesystem accounting information: done
+Allocating group tables: 0/1   done                            
+Writing inode tables: 0/1   done                            
+Writing superblocks and filesystem accounting information: 0/1   done
 
 Filesystem features: ext_attr resize_inode dir_index filetype sparse_super large_file
  
diff --git a/tests/m_meta_bg/expect.1 b/tests/m_meta_bg/expect.1
index d44be8cf..b33b5d3d 100644
--- a/tests/m_meta_bg/expect.1
+++ b/tests/m_meta_bg/expect.1
@@ -11,8 +11,9 @@ First data block=1
 Superblock backups stored on blocks: 
 	1025, 3073, 5121, 7169, 9217, 25601, 27649, 50177, 82945, 128001
 
-Writing inode tables: done                            
-Writing superblocks and filesystem accounting information: done
+Allocating group tables:   0/128  1/128  2/128  3/128  4/128  5/128  6/128  7/128  8/128  9/128 10/128 11/128 12/128 13/128 14/128 15/128 16/128 17/128 18/128 19/128 20/128 21/128 22/128 23/128 24/128 25/128 26/128 27/128 28/128 29/128 30/128 31/128 32/128 33/128 34/128 35/128 36/128 37/128 38/128 39/128 40/128 41/128 42/128 43/128 44/128 45/128 46/128 47/128 48/128 49/128 50/128 51/128 52/128 53/128 54/128 55/128 56/128 57/128 58/128 59/128 60/128 61/128 62/128 63/128 64/128 65/128 66/128 67/128 68/128 69/128 70/128 71/128 72/128 73/128 74/128 75/128 76/128 77/128 78/128 79/128 80/128 81/128 82/128 83/128 84/128 85/128 86/128 87/128 88/128 89/128 90/128 91/128 92/128 93/128 94/128 95/128 96/128 97/128 98/128 99/128100/128101/128102/128103/128104/128105/128106/128107/128108/128109/128110/128111/128112/128113/128114/128115/128116/128117/128118/128119/128120/128121/128122/128123/128124/128125/128126/128127/128       done                            
+Writing inode tables:   0/128  1/128  2/128  3/128  4/128  5/128  6/128  7/128  8/128  9/128 10/128 11/128 12/128 13/128 14/128 15/128 16/128 17/128 18/128 19/128 20/128 21/128 22/128 23/128 24/128 25/128 26/128 27/128 28/128 29/128 30/128 31/128 32/128 33/128 34/128 35/128 36/128 37/128 38/128 39/128 40/128 41/128 42/128 43/128 44/128 45/128 46/128 47/128 48/128 49/128 50/128 51/128 52/128 53/128 54/128 55/128 56/128 57/128 58/128 59/128 60/128 61/128 62/128 63/128 64/128 65/128 66/128 67/128 68/128 69/128 70/128 71/128 72/128 73/128 74/128 75/128 76/128 77/128 78/128 79/128 80/128 81/128 82/128 83/128 84/128 85/128 86/128 87/128 88/128 89/128 90/128 91/128 92/128 93/128 94/128 95/128 96/128 97/128 98/128 99/128100/128101/128102/128103/128104/128105/128106/128107/128108/128109/128110/128111/128112/128113/128114/128115/128116/128117/128118/128119/128120/128121/128122/128123/128124/128125/128126/128127/128       done                            
+Writing superblocks and filesystem accounting information:   0/128  1/128  2/128  3/128  4/128  5/128  6/128  7/128  8/128  9/128 10/128 11/128 12/128 13/128 14/128 15/128 16/128 17/128 18/128 19/128 20/128 21/128 22/128 23/128 24/128 25/128 26/128 27/128 28/128 29/128 30/128 31/128 32/128 33/128 34/128 35/128 36/128 37/128 38/128 39/128 40/128 41/128 42/128 43/128 44/128 45/128 46/128 47/128 48/128 49/128 50/128 51/128 52/128 53/128 54/128 55/128 56/128 57/128 58/128 59/128 60/128 61/128 62/128 63/128 64/128 65/128 66/128 67/128 68/128 69/128 70/128 71/128 72/128 73/128 74/128 75/128 76/128 77/128 78/128 79/128 80/128 81/128 82/128 83/128 84/128 85/128 86/128 87/128 88/128 89/128 90/128 91/128 92/128 93/128 94/128 95/128 96/128 97/128 98/128 99/128100/128101/128102/128103/128104/128105/128106/128107/128108/128109/128110/128111/128112/128113/128114/128115/128116/128117/128118/128119/128120/128121/128122/128123/128124/128125/128126/128127/128       done
 
 Filesystem features: ext_attr dir_index filetype meta_bg sparse_super
  
diff --git a/tests/m_no_opt/expect.1 b/tests/m_no_opt/expect.1
index faa565d8..949f0d22 100644
--- a/tests/m_no_opt/expect.1
+++ b/tests/m_no_opt/expect.1
@@ -11,8 +11,9 @@ First data block=1
 Superblock backups stored on blocks: 
 	8193, 16385, 24577, 32769, 40961, 49153, 57345
 
-Writing inode tables: done                            
-Writing superblocks and filesystem accounting information: done
+Allocating group tables: 0/81/82/83/84/85/86/87/8   done                            
+Writing inode tables: 0/81/82/83/84/85/86/87/8   done                            
+Writing superblocks and filesystem accounting information: 0/81/82/83/84/85/86/87/8   done
 
 Filesystem features:(none)
  
diff --git a/tests/m_raid_opt/expect.1 b/tests/m_raid_opt/expect.1
index 181534d8..17b4d5d2 100644
--- a/tests/m_raid_opt/expect.1
+++ b/tests/m_raid_opt/expect.1
@@ -12,8 +12,9 @@ Maximum filesystem blocks=8519680
 Superblock backups stored on blocks: 
 	1025, 3073, 5121, 7169, 9217, 25601, 27649, 50177, 82945, 128001
 
-Writing inode tables: done                            
-Writing superblocks and filesystem accounting information: done
+Allocating group tables:   0/128  1/128  2/128  3/128  4/128  5/128  6/128  7/128  8/128  9/128 10/128 11/128 12/128 13/128 14/128 15/128 16/128 17/128 18/128 19/128 20/128 21/128 22/128 23/128 24/128 25/128 26/128 27/128 28/128 29/128 30/128 31/128 32/128 33/128 34/128 35/128 36/128 37/128 38/128 39/128 40/128 41/128 42/128 43/128 44/128 45/128 46/128 47/128 48/128 49/128 50/128 51/128 52/128 53/128 54/128 55/128 56/128 57/128 58/128 59/128 60/128 61/128 62/128 63/128 64/128 65/128 66/128 67/128 68/128 69/128 70/128 71/128 72/128 73/128 74/128 75/128 76/128 77/128 78/128 79/128 80/128 81/128 82/128 83/128 84/128 85/128 86/128 87/128 88/128 89/128 90/128 91/128 92/128 93/128 94/128 95/128 96/128 97/128 98/128 99/128100/128101/128102/128103/128104/128105/128106/128107/128108/128109/128110/128111/128112/128113/128114/128115/128116/128117/128118/128119/128120/128121/128122/128123/128124/128125/128126/128127/128       done                            
+Writing inode tables:   0/128  1/128  2/128  3/128  4/128  5/128  6/128  7/128  8/128  9/128 10/128 11/128 12/128 13/128 14/128 15/128 16/128 17/128 18/128 19/128 20/128 21/128 22/128 23/128 24/128 25/128 26/128 27/128 28/128 29/128 30/128 31/128 32/128 33/128 34/128 35/128 36/128 37/128 38/128 39/128 40/128 41/128 42/128 43/128 44/128 45/128 46/128 47/128 48/128 49/128 50/128 51/128 52/128 53/128 54/128 55/128 56/128 57/128 58/128 59/128 60/128 61/128 62/128 63/128 64/128 65/128 66/128 67/128 68/128 69/128 70/128 71/128 72/128 73/128 74/128 75/128 76/128 77/128 78/128 79/128 80/128 81/128 82/128 83/128 84/128 85/128 86/128 87/128 88/128 89/128 90/128 91/128 92/128 93/128 94/128 95/128 96/128 97/128 98/128 99/128100/128101/128102/128103/128104/128105/128106/128107/128108/128109/128110/128111/128112/128113/128114/128115/128116/128117/128118/128119/128120/128121/128122/128123/128124/128125/128126/128127/128       done                            
+Writing superblocks and filesystem accounting information:   0/128  1/128  2/128  3/128  4/128  5/128  6/128  7/128  8/128  9/128 10/128 11/128 12/128 13/128 14/128 15/128 16/128 17/128 18/128 19/128 20/128 21/128 22/128 23/128 24/128 25/128 26/128 27/128 28/128 29/128 30/128 31/128 32/128 33/128 34/128 35/128 36/128 37/128 38/128 39/128 40/128 41/128 42/128 43/128 44/128 45/128 46/128 47/128 48/128 49/128 50/128 51/128 52/128 53/128 54/128 55/128 56/128 57/128 58/128 59/128 60/128 61/128 62/128 63/128 64/128 65/128 66/128 67/128 68/128 69/128 70/128 71/128 72/128 73/128 74/128 75/128 76/128 77/128 78/128 79/128 80/128 81/128 82/128 83/128 84/128 85/128 86/128 87/128 88/128 89/128 90/128 91/128 92/128 93/128 94/128 95/128 96/128 97/128 98/128 99/128100/128101/128102/128103/128104/128105/128106/128107/128108/128109/128110/128111/128112/128113/128114/128115/128116/128117/128118/128119/128120/128121/128122/128123/128124/128125/128126/128127/128       done
 
 Filesystem features: ext_attr resize_inode dir_index filetype sparse_super
  
diff --git a/tests/m_std/expect.1 b/tests/m_std/expect.1
index 44835785..c04ed57c 100644
--- a/tests/m_std/expect.1
+++ b/tests/m_std/expect.1
@@ -12,8 +12,9 @@ Maximum filesystem blocks=67108864
 Superblock backups stored on blocks: 
 	8193, 24577, 40961, 57345
 
-Writing inode tables: done                            
-Writing superblocks and filesystem accounting information: done
+Allocating group tables: 0/81/82/83/84/85/86/87/8   done                            
+Writing inode tables: 0/81/82/83/84/85/86/87/8   done                            
+Writing superblocks and filesystem accounting information: 0/81/82/83/84/85/86/87/8   done
 
 Filesystem features: ext_attr resize_inode dir_index filetype sparse_super
  
diff --git a/tests/m_uninit/expect.1 b/tests/m_uninit/expect.1
index 67cd33db..fe98b2d8 100644
--- a/tests/m_uninit/expect.1
+++ b/tests/m_uninit/expect.1
@@ -12,10 +12,11 @@ Maximum filesystem blocks=67371008
 Superblock backups stored on blocks: 
 	8193, 24577, 40961, 57345, 73729
 
-Writing inode tables: done                            
-Writing superblocks and filesystem accounting information: done
+Allocating group tables:  0/16 1/16 2/16 3/16 4/16 5/16 6/16 7/16 8/16 9/1610/1611/1612/1613/1614/1615/16     done                            
+Writing inode tables:  0/16 1/16 2/16 3/16 4/16 5/16 6/16 7/16 8/16 9/1610/1611/1612/1613/1614/1615/16     done                            
+Writing superblocks and filesystem accounting information:  0/16 1/16 2/16 3/16 4/16 5/16 6/16 7/16 8/16 9/1610/1611/1612/1613/1614/1615/16     done
 
-Filesystem features: ext_attr resize_inode dir_index filetype sparse_super uninit_bg
+ 0/16 1/16 2/16 3/16 4/16 5/16 6/16 7/16 8/16 9/1610/1611/1612/1613/1614/1615/16     Filesystem features: ext_attr resize_inode dir_index filetype sparse_super uninit_bg
  
 Pass 1: Checking inodes, blocks, and sizes
 Pass 2: Checking directory structure