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>

diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
index d6ba05b098790737a174a9e4990a245a2c59226f..9dbe5f2e7a88b5d103270adf253c320d48e7f22c 100644 (file)
--- 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 a72cac62e2a3810f92db26b11e2438d9d275a22a..952bbcc74ce177cc5fcdae85849362f5a9b8ceec 100644 (file)
--- 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 2cf8a8bb3431755d059fec6ef6282994e9188531..613908b496076370b86912ddb96b9a42bde11918 100644 (file)
--- 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 20c20053ba6b2cc1b7caa4788ebbe1715ebe74cd..488fb6df87e6dad95095bd5af8d1d3aa66d31b86 100644 (file)
--- 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 2ec091ef82e695e012e46faf918e07170c616e33..300e4425bd98c332ef04a2b9486eb1bc70adadbd 100644 (file)
--- 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 (file)
index 0000000..5ad2a45
--- /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 ff02d398c5ad02d43a87090c6fb6d7c1e86373b7..7287181ecc26c2ffe83f947fbcd846041357eda3 100644 (file)
--- 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 bd45575a4ce0faff270d3d193448c27f6b1ea109..8844647d769f16fa5a4fb27d6f9fadc3ec9000b1 100644 (file)
--- 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\b\b\b\b\b 1/16\b\b\b\b\b 2/16\b\b\b\b\b 3/16\b\b\b\b\b 4/16\b\b\b\b\b 5/16\b\b\b\b\b 6/16\b\b\b\b\b 7/16\b\b\b\b\b 8/16\b\b\b\b\b 9/16\b\b\b\b\b10/16\b\b\b\b\b11/16\b\b\b\b\b12/16\b\b\b\b\b13/16\b\b\b\b\b14/16\b\b\b\b\b15/16\b\b\b\b\bdone                            
-Writing superblocks and filesystem accounting information: done
+Allocating group tables:  0/16\b\b\b\b\b 1/16\b\b\b\b\b 2/16\b\b\b\b\b 3/16\b\b\b\b\b 4/16\b\b\b\b\b 5/16\b\b\b\b\b 6/16\b\b\b\b\b 7/16\b\b\b\b\b 8/16\b\b\b\b\b 9/16\b\b\b\b\b10/16\b\b\b\b\b11/16\b\b\b\b\b12/16\b\b\b\b\b13/16\b\b\b\b\b14/16\b\b\b\b\b15/16\b\b\b\b\b     \b\b\b\b\bdone                            
+Writing inode tables:  0/16\b\b\b\b\b 1/16\b\b\b\b\b 2/16\b\b\b\b\b 3/16\b\b\b\b\b 4/16\b\b\b\b\b 5/16\b\b\b\b\b 6/16\b\b\b\b\b 7/16\b\b\b\b\b 8/16\b\b\b\b\b 9/16\b\b\b\b\b10/16\b\b\b\b\b11/16\b\b\b\b\b12/16\b\b\b\b\b13/16\b\b\b\b\b14/16\b\b\b\b\b15/16\b\b\b\b\b     \b\b\b\b\bdone                            
+Writing superblocks and filesystem accounting information:  0/16\b\b\b\b\b 1/16\b\b\b\b\b 2/16\b\b\b\b\b 3/16\b\b\b\b\b 4/16\b\b\b\b\b 5/16\b\b\b\b\b 6/16\b\b\b\b\b 7/16\b\b\b\b\b 8/16\b\b\b\b\b 9/16\b\b\b\b\b10/16\b\b\b\b\b11/16\b\b\b\b\b12/16\b\b\b\b\b13/16\b\b\b\b\b14/16\b\b\b\b\b15/16\b\b\b\b\b     \b\b\b\b\bdone
 
 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 9bc8a856e5647ec6341a7709589b8bce3dcf3319..a3b4465d1ecf913b562408d113d548299a27f5ca 100644 (file)
--- 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/2\b\b\b1/2\b\b\b   \b\b\bdone                            
+Writing inode tables: 0/2\b\b\b1/2\b\b\b   \b\b\bdone                            
+Writing superblocks and filesystem accounting information: 0/2\b\b\b1/2\b\b\b   \b\b\bdone
 
 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 abf2d997c087821d00aaec5bbf101d6ac9cb9494..647e7af20dbd774804ceb8644d2cd65ae15a203e 100644 (file)
--- 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\b\b\b   \b\b\bdone                            
+Writing inode tables: 0/1\b\b\b   \b\b\bdone                            
+Writing superblocks and filesystem accounting information: 0/1\b\b\b   \b\b\bdone
 
 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 d44be8cf0dc8d1a528a06e7d6aa35e73602624c3..b33b5d3d5b3cd08a0abf46d52d8434523957dbb2 100644 (file)
--- 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\b\b\b\b\b\b\b  1/128\b\b\b\b\b\b\b  2/128\b\b\b\b\b\b\b  3/128\b\b\b\b\b\b\b  4/128\b\b\b\b\b\b\b  5/128\b\b\b\b\b\b\b  6/128\b\b\b\b\b\b\b  7/128\b\b\b\b\b\b\b  8/128\b\b\b\b\b\b\b  9/128\b\b\b\b\b\b\b 10/128\b\b\b\b\b\b\b 11/128\b\b\b\b\b\b\b 12/128\b\b\b\b\b\b\b 13/128\b\b\b\b\b\b\b 14/128\b\b\b\b\b\b\b 15/128\b\b\b\b\b\b\b 16/128\b\b\b\b\b\b\b 17/128\b\b\b\b\b\b\b 18/128\b\b\b\b\b\b\b 19/128\b\b\b\b\b\b\b 20/128\b\b\b\b\b\b\b 21/128\b\b\b\b\b\b\b 22/128\b\b\b\b\b\b\b 23/128\b\b\b\b\b\b\b 24/128\b\b\b\b\b\b\b 25/128\b\b\b\b\b\b\b 26/128\b\b\b\b\b\b\b 27/128\b\b\b\b\b\b\b 28/128\b\b\b\b\b\b\b 29/128\b\b\b\b\b\b\b 30/128\b\b\b\b\b\b\b 31/128\b\b\b\b\b\b\b 32/128\b\b\b\b\b\b\b 33/128\b\b\b\b\b\b\b 34/128\b\b\b\b\b\b\b 35/128\b\b\b\b\b\b\b 36/128\b\b\b\b\b\b\b 37/128\b\b\b\b\b\b\b 38/128\b\b\b\b\b\b\b 39/128\b\b\b\b\b\b\b 40/128\b\b\b\b\b\b\b 41/128\b\b\b\b\b\b\b 42/128\b\b\b\b\b\b\b 43/128\b\b\b\b\b\b\b 44/128\b\b\b\b\b\b\b 45/128\b\b\b\b\b\b\b 46/128\b\b\b\b\b\b\b 47/128\b\b\b\b\b\b\b 48/128\b\b\b\b\b\b\b 49/128\b\b\b\b\b\b\b 50/128\b\b\b\b\b\b\b 51/128\b\b\b\b\b\b\b 52/128\b\b\b\b\b\b\b 53/128\b\b\b\b\b\b\b 54/128\b\b\b\b\b\b\b 55/128\b\b\b\b\b\b\b 56/128\b\b\b\b\b\b\b 57/128\b\b\b\b\b\b\b 58/128\b\b\b\b\b\b\b 59/128\b\b\b\b\b\b\b 60/128\b\b\b\b\b\b\b 61/128\b\b\b\b\b\b\b 62/128\b\b\b\b\b\b\b 63/128\b\b\b\b\b\b\b 64/128\b\b\b\b\b\b\b 65/128\b\b\b\b\b\b\b 66/128\b\b\b\b\b\b\b 67/128\b\b\b\b\b\b\b 68/128\b\b\b\b\b\b\b 69/128\b\b\b\b\b\b\b 70/128\b\b\b\b\b\b\b 71/128\b\b\b\b\b\b\b 72/128\b\b\b\b\b\b\b 73/128\b\b\b\b\b\b\b 74/128\b\b\b\b\b\b\b 75/128\b\b\b\b\b\b\b 76/128\b\b\b\b\b\b\b 77/128\b\b\b\b\b\b\b 78/128\b\b\b\b\b\b\b 79/128\b\b\b\b\b\b\b 80/128\b\b\b\b\b\b\b 81/128\b\b\b\b\b\b\b 82/128\b\b\b\b\b\b\b 83/128\b\b\b\b\b\b\b 84/128\b\b\b\b\b\b\b 85/128\b\b\b\b\b\b\b 86/128\b\b\b\b\b\b\b 87/128\b\b\b\b\b\b\b 88/128\b\b\b\b\b\b\b 89/128\b\b\b\b\b\b\b 90/128\b\b\b\b\b\b\b 91/128\b\b\b\b\b\b\b 92/128\b\b\b\b\b\b\b 93/128\b\b\b\b\b\b\b 94/128\b\b\b\b\b\b\b 95/128\b\b\b\b\b\b\b 96/128\b\b\b\b\b\b\b 97/128\b\b\b\b\b\b\b 98/128\b\b\b\b\b\b\b 99/128\b\b\b\b\b\b\b100/128\b\b\b\b\b\b\b101/128\b\b\b\b\b\b\b102/128\b\b\b\b\b\b\b103/128\b\b\b\b\b\b\b104/128\b\b\b\b\b\b\b105/128\b\b\b\b\b\b\b106/128\b\b\b\b\b\b\b107/128\b\b\b\b\b\b\b108/128\b\b\b\b\b\b\b109/128\b\b\b\b\b\b\b110/128\b\b\b\b\b\b\b111/128\b\b\b\b\b\b\b112/128\b\b\b\b\b\b\b113/128\b\b\b\b\b\b\b114/128\b\b\b\b\b\b\b115/128\b\b\b\b\b\b\b116/128\b\b\b\b\b\b\b117/128\b\b\b\b\b\b\b118/128\b\b\b\b\b\b\b119/128\b\b\b\b\b\b\b120/128\b\b\b\b\b\b\b121/128\b\b\b\b\b\b\b122/128\b\b\b\b\b\b\b123/128\b\b\b\b\b\b\b124/128\b\b\b\b\b\b\b125/128\b\b\b\b\b\b\b126/128\b\b\b\b\b\b\b127/128\b\b\b\b\b\b\b       \b\b\b\b\b\b\bdone                            
+Writing inode tables:   0/128\b\b\b\b\b\b\b  1/128\b\b\b\b\b\b\b  2/128\b\b\b\b\b\b\b  3/128\b\b\b\b\b\b\b  4/128\b\b\b\b\b\b\b  5/128\b\b\b\b\b\b\b  6/128\b\b\b\b\b\b\b  7/128\b\b\b\b\b\b\b  8/128\b\b\b\b\b\b\b  9/128\b\b\b\b\b\b\b 10/128\b\b\b\b\b\b\b 11/128\b\b\b\b\b\b\b 12/128\b\b\b\b\b\b\b 13/128\b\b\b\b\b\b\b 14/128\b\b\b\b\b\b\b 15/128\b\b\b\b\b\b\b 16/128\b\b\b\b\b\b\b 17/128\b\b\b\b\b\b\b 18/128\b\b\b\b\b\b\b 19/128\b\b\b\b\b\b\b 20/128\b\b\b\b\b\b\b 21/128\b\b\b\b\b\b\b 22/128\b\b\b\b\b\b\b 23/128\b\b\b\b\b\b\b 24/128\b\b\b\b\b\b\b 25/128\b\b\b\b\b\b\b 26/128\b\b\b\b\b\b\b 27/128\b\b\b\b\b\b\b 28/128\b\b\b\b\b\b\b 29/128\b\b\b\b\b\b\b 30/128\b\b\b\b\b\b\b 31/128\b\b\b\b\b\b\b 32/128\b\b\b\b\b\b\b 33/128\b\b\b\b\b\b\b 34/128\b\b\b\b\b\b\b 35/128\b\b\b\b\b\b\b 36/128\b\b\b\b\b\b\b 37/128\b\b\b\b\b\b\b 38/128\b\b\b\b\b\b\b 39/128\b\b\b\b\b\b\b 40/128\b\b\b\b\b\b\b 41/128\b\b\b\b\b\b\b 42/128\b\b\b\b\b\b\b 43/128\b\b\b\b\b\b\b 44/128\b\b\b\b\b\b\b 45/128\b\b\b\b\b\b\b 46/128\b\b\b\b\b\b\b 47/128\b\b\b\b\b\b\b 48/128\b\b\b\b\b\b\b 49/128\b\b\b\b\b\b\b 50/128\b\b\b\b\b\b\b 51/128\b\b\b\b\b\b\b 52/128\b\b\b\b\b\b\b 53/128\b\b\b\b\b\b\b 54/128\b\b\b\b\b\b\b 55/128\b\b\b\b\b\b\b 56/128\b\b\b\b\b\b\b 57/128\b\b\b\b\b\b\b 58/128\b\b\b\b\b\b\b 59/128\b\b\b\b\b\b\b 60/128\b\b\b\b\b\b\b 61/128\b\b\b\b\b\b\b 62/128\b\b\b\b\b\b\b 63/128\b\b\b\b\b\b\b 64/128\b\b\b\b\b\b\b 65/128\b\b\b\b\b\b\b 66/128\b\b\b\b\b\b\b 67/128\b\b\b\b\b\b\b 68/128\b\b\b\b\b\b\b 69/128\b\b\b\b\b\b\b 70/128\b\b\b\b\b\b\b 71/128\b\b\b\b\b\b\b 72/128\b\b\b\b\b\b\b 73/128\b\b\b\b\b\b\b 74/128\b\b\b\b\b\b\b 75/128\b\b\b\b\b\b\b 76/128\b\b\b\b\b\b\b 77/128\b\b\b\b\b\b\b 78/128\b\b\b\b\b\b\b 79/128\b\b\b\b\b\b\b 80/128\b\b\b\b\b\b\b 81/128\b\b\b\b\b\b\b 82/128\b\b\b\b\b\b\b 83/128\b\b\b\b\b\b\b 84/128\b\b\b\b\b\b\b 85/128\b\b\b\b\b\b\b 86/128\b\b\b\b\b\b\b 87/128\b\b\b\b\b\b\b 88/128\b\b\b\b\b\b\b 89/128\b\b\b\b\b\b\b 90/128\b\b\b\b\b\b\b 91/128\b\b\b\b\b\b\b 92/128\b\b\b\b\b\b\b 93/128\b\b\b\b\b\b\b 94/128\b\b\b\b\b\b\b 95/128\b\b\b\b\b\b\b 96/128\b\b\b\b\b\b\b 97/128\b\b\b\b\b\b\b 98/128\b\b\b\b\b\b\b 99/128\b\b\b\b\b\b\b100/128\b\b\b\b\b\b\b101/128\b\b\b\b\b\b\b102/128\b\b\b\b\b\b\b103/128\b\b\b\b\b\b\b104/128\b\b\b\b\b\b\b105/128\b\b\b\b\b\b\b106/128\b\b\b\b\b\b\b107/128\b\b\b\b\b\b\b108/128\b\b\b\b\b\b\b109/128\b\b\b\b\b\b\b110/128\b\b\b\b\b\b\b111/128\b\b\b\b\b\b\b112/128\b\b\b\b\b\b\b113/128\b\b\b\b\b\b\b114/128\b\b\b\b\b\b\b115/128\b\b\b\b\b\b\b116/128\b\b\b\b\b\b\b117/128\b\b\b\b\b\b\b118/128\b\b\b\b\b\b\b119/128\b\b\b\b\b\b\b120/128\b\b\b\b\b\b\b121/128\b\b\b\b\b\b\b122/128\b\b\b\b\b\b\b123/128\b\b\b\b\b\b\b124/128\b\b\b\b\b\b\b125/128\b\b\b\b\b\b\b126/128\b\b\b\b\b\b\b127/128\b\b\b\b\b\b\b       \b\b\b\b\b\b\bdone                            
+Writing superblocks and filesystem accounting information:   0/128\b\b\b\b\b\b\b  1/128\b\b\b\b\b\b\b  2/128\b\b\b\b\b\b\b  3/128\b\b\b\b\b\b\b  4/128\b\b\b\b\b\b\b  5/128\b\b\b\b\b\b\b  6/128\b\b\b\b\b\b\b  7/128\b\b\b\b\b\b\b  8/128\b\b\b\b\b\b\b  9/128\b\b\b\b\b\b\b 10/128\b\b\b\b\b\b\b 11/128\b\b\b\b\b\b\b 12/128\b\b\b\b\b\b\b 13/128\b\b\b\b\b\b\b 14/128\b\b\b\b\b\b\b 15/128\b\b\b\b\b\b\b 16/128\b\b\b\b\b\b\b 17/128\b\b\b\b\b\b\b 18/128\b\b\b\b\b\b\b 19/128\b\b\b\b\b\b\b 20/128\b\b\b\b\b\b\b 21/128\b\b\b\b\b\b\b 22/128\b\b\b\b\b\b\b 23/128\b\b\b\b\b\b\b 24/128\b\b\b\b\b\b\b 25/128\b\b\b\b\b\b\b 26/128\b\b\b\b\b\b\b 27/128\b\b\b\b\b\b\b 28/128\b\b\b\b\b\b\b 29/128\b\b\b\b\b\b\b 30/128\b\b\b\b\b\b\b 31/128\b\b\b\b\b\b\b 32/128\b\b\b\b\b\b\b 33/128\b\b\b\b\b\b\b 34/128\b\b\b\b\b\b\b 35/128\b\b\b\b\b\b\b 36/128\b\b\b\b\b\b\b 37/128\b\b\b\b\b\b\b 38/128\b\b\b\b\b\b\b 39/128\b\b\b\b\b\b\b 40/128\b\b\b\b\b\b\b 41/128\b\b\b\b\b\b\b 42/128\b\b\b\b\b\b\b 43/128\b\b\b\b\b\b\b 44/128\b\b\b\b\b\b\b 45/128\b\b\b\b\b\b\b 46/128\b\b\b\b\b\b\b 47/128\b\b\b\b\b\b\b 48/128\b\b\b\b\b\b\b 49/128\b\b\b\b\b\b\b 50/128\b\b\b\b\b\b\b 51/128\b\b\b\b\b\b\b 52/128\b\b\b\b\b\b\b 53/128\b\b\b\b\b\b\b 54/128\b\b\b\b\b\b\b 55/128\b\b\b\b\b\b\b 56/128\b\b\b\b\b\b\b 57/128\b\b\b\b\b\b\b 58/128\b\b\b\b\b\b\b 59/128\b\b\b\b\b\b\b 60/128\b\b\b\b\b\b\b 61/128\b\b\b\b\b\b\b 62/128\b\b\b\b\b\b\b 63/128\b\b\b\b\b\b\b 64/128\b\b\b\b\b\b\b 65/128\b\b\b\b\b\b\b 66/128\b\b\b\b\b\b\b 67/128\b\b\b\b\b\b\b 68/128\b\b\b\b\b\b\b 69/128\b\b\b\b\b\b\b 70/128\b\b\b\b\b\b\b 71/128\b\b\b\b\b\b\b 72/128\b\b\b\b\b\b\b 73/128\b\b\b\b\b\b\b 74/128\b\b\b\b\b\b\b 75/128\b\b\b\b\b\b\b 76/128\b\b\b\b\b\b\b 77/128\b\b\b\b\b\b\b 78/128\b\b\b\b\b\b\b 79/128\b\b\b\b\b\b\b 80/128\b\b\b\b\b\b\b 81/128\b\b\b\b\b\b\b 82/128\b\b\b\b\b\b\b 83/128\b\b\b\b\b\b\b 84/128\b\b\b\b\b\b\b 85/128\b\b\b\b\b\b\b 86/128\b\b\b\b\b\b\b 87/128\b\b\b\b\b\b\b 88/128\b\b\b\b\b\b\b 89/128\b\b\b\b\b\b\b 90/128\b\b\b\b\b\b\b 91/128\b\b\b\b\b\b\b 92/128\b\b\b\b\b\b\b 93/128\b\b\b\b\b\b\b 94/128\b\b\b\b\b\b\b 95/128\b\b\b\b\b\b\b 96/128\b\b\b\b\b\b\b 97/128\b\b\b\b\b\b\b 98/128\b\b\b\b\b\b\b 99/128\b\b\b\b\b\b\b100/128\b\b\b\b\b\b\b101/128\b\b\b\b\b\b\b102/128\b\b\b\b\b\b\b103/128\b\b\b\b\b\b\b104/128\b\b\b\b\b\b\b105/128\b\b\b\b\b\b\b106/128\b\b\b\b\b\b\b107/128\b\b\b\b\b\b\b108/128\b\b\b\b\b\b\b109/128\b\b\b\b\b\b\b110/128\b\b\b\b\b\b\b111/128\b\b\b\b\b\b\b112/128\b\b\b\b\b\b\b113/128\b\b\b\b\b\b\b114/128\b\b\b\b\b\b\b115/128\b\b\b\b\b\b\b116/128\b\b\b\b\b\b\b117/128\b\b\b\b\b\b\b118/128\b\b\b\b\b\b\b119/128\b\b\b\b\b\b\b120/128\b\b\b\b\b\b\b121/128\b\b\b\b\b\b\b122/128\b\b\b\b\b\b\b123/128\b\b\b\b\b\b\b124/128\b\b\b\b\b\b\b125/128\b\b\b\b\b\b\b126/128\b\b\b\b\b\b\b127/128\b\b\b\b\b\b\b       \b\b\b\b\b\b\bdone
 
 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 faa565d85a030218a43299d2245963b3732d64e8..949f0d222e2abcdaf1712050fa4ab34810f00b28 100644 (file)
--- 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/8\b\b\b1/8\b\b\b2/8\b\b\b3/8\b\b\b4/8\b\b\b5/8\b\b\b6/8\b\b\b7/8\b\b\b   \b\b\bdone                            
+Writing inode tables: 0/8\b\b\b1/8\b\b\b2/8\b\b\b3/8\b\b\b4/8\b\b\b5/8\b\b\b6/8\b\b\b7/8\b\b\b   \b\b\bdone                            
+Writing superblocks and filesystem accounting information: 0/8\b\b\b1/8\b\b\b2/8\b\b\b3/8\b\b\b4/8\b\b\b5/8\b\b\b6/8\b\b\b7/8\b\b\b   \b\b\bdone
 
 Filesystem features:(none)
  

diff --git a/tests/m_raid_opt/expect.1 b/tests/m_raid_opt/expect.1
index 181534d834984275dbb6cd21645b8b80bb714b97..17b4d5d2be324161c8232f490cd05a3d8ba38291 100644 (file)
--- 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\b\b\b\b\b\b\b  1/128\b\b\b\b\b\b\b  2/128\b\b\b\b\b\b\b  3/128\b\b\b\b\b\b\b  4/128\b\b\b\b\b\b\b  5/128\b\b\b\b\b\b\b  6/128\b\b\b\b\b\b\b  7/128\b\b\b\b\b\b\b  8/128\b\b\b\b\b\b\b  9/128\b\b\b\b\b\b\b 10/128\b\b\b\b\b\b\b 11/128\b\b\b\b\b\b\b 12/128\b\b\b\b\b\b\b 13/128\b\b\b\b\b\b\b 14/128\b\b\b\b\b\b\b 15/128\b\b\b\b\b\b\b 16/128\b\b\b\b\b\b\b 17/128\b\b\b\b\b\b\b 18/128\b\b\b\b\b\b\b 19/128\b\b\b\b\b\b\b 20/128\b\b\b\b\b\b\b 21/128\b\b\b\b\b\b\b 22/128\b\b\b\b\b\b\b 23/128\b\b\b\b\b\b\b 24/128\b\b\b\b\b\b\b 25/128\b\b\b\b\b\b\b 26/128\b\b\b\b\b\b\b 27/128\b\b\b\b\b\b\b 28/128\b\b\b\b\b\b\b 29/128\b\b\b\b\b\b\b 30/128\b\b\b\b\b\b\b 31/128\b\b\b\b\b\b\b 32/128\b\b\b\b\b\b\b 33/128\b\b\b\b\b\b\b 34/128\b\b\b\b\b\b\b 35/128\b\b\b\b\b\b\b 36/128\b\b\b\b\b\b\b 37/128\b\b\b\b\b\b\b 38/128\b\b\b\b\b\b\b 39/128\b\b\b\b\b\b\b 40/128\b\b\b\b\b\b\b 41/128\b\b\b\b\b\b\b 42/128\b\b\b\b\b\b\b 43/128\b\b\b\b\b\b\b 44/128\b\b\b\b\b\b\b 45/128\b\b\b\b\b\b\b 46/128\b\b\b\b\b\b\b 47/128\b\b\b\b\b\b\b 48/128\b\b\b\b\b\b\b 49/128\b\b\b\b\b\b\b 50/128\b\b\b\b\b\b\b 51/128\b\b\b\b\b\b\b 52/128\b\b\b\b\b\b\b 53/128\b\b\b\b\b\b\b 54/128\b\b\b\b\b\b\b 55/128\b\b\b\b\b\b\b 56/128\b\b\b\b\b\b\b 57/128\b\b\b\b\b\b\b 58/128\b\b\b\b\b\b\b 59/128\b\b\b\b\b\b\b 60/128\b\b\b\b\b\b\b 61/128\b\b\b\b\b\b\b 62/128\b\b\b\b\b\b\b 63/128\b\b\b\b\b\b\b 64/128\b\b\b\b\b\b\b 65/128\b\b\b\b\b\b\b 66/128\b\b\b\b\b\b\b 67/128\b\b\b\b\b\b\b 68/128\b\b\b\b\b\b\b 69/128\b\b\b\b\b\b\b 70/128\b\b\b\b\b\b\b 71/128\b\b\b\b\b\b\b 72/128\b\b\b\b\b\b\b 73/128\b\b\b\b\b\b\b 74/128\b\b\b\b\b\b\b 75/128\b\b\b\b\b\b\b 76/128\b\b\b\b\b\b\b 77/128\b\b\b\b\b\b\b 78/128\b\b\b\b\b\b\b 79/128\b\b\b\b\b\b\b 80/128\b\b\b\b\b\b\b 81/128\b\b\b\b\b\b\b 82/128\b\b\b\b\b\b\b 83/128\b\b\b\b\b\b\b 84/128\b\b\b\b\b\b\b 85/128\b\b\b\b\b\b\b 86/128\b\b\b\b\b\b\b 87/128\b\b\b\b\b\b\b 88/128\b\b\b\b\b\b\b 89/128\b\b\b\b\b\b\b 90/128\b\b\b\b\b\b\b 91/128\b\b\b\b\b\b\b 92/128\b\b\b\b\b\b\b 93/128\b\b\b\b\b\b\b 94/128\b\b\b\b\b\b\b 95/128\b\b\b\b\b\b\b 96/128\b\b\b\b\b\b\b 97/128\b\b\b\b\b\b\b 98/128\b\b\b\b\b\b\b 99/128\b\b\b\b\b\b\b100/128\b\b\b\b\b\b\b101/128\b\b\b\b\b\b\b102/128\b\b\b\b\b\b\b103/128\b\b\b\b\b\b\b104/128\b\b\b\b\b\b\b105/128\b\b\b\b\b\b\b106/128\b\b\b\b\b\b\b107/128\b\b\b\b\b\b\b108/128\b\b\b\b\b\b\b109/128\b\b\b\b\b\b\b110/128\b\b\b\b\b\b\b111/128\b\b\b\b\b\b\b112/128\b\b\b\b\b\b\b113/128\b\b\b\b\b\b\b114/128\b\b\b\b\b\b\b115/128\b\b\b\b\b\b\b116/128\b\b\b\b\b\b\b117/128\b\b\b\b\b\b\b118/128\b\b\b\b\b\b\b119/128\b\b\b\b\b\b\b120/128\b\b\b\b\b\b\b121/128\b\b\b\b\b\b\b122/128\b\b\b\b\b\b\b123/128\b\b\b\b\b\b\b124/128\b\b\b\b\b\b\b125/128\b\b\b\b\b\b\b126/128\b\b\b\b\b\b\b127/128\b\b\b\b\b\b\b       \b\b\b\b\b\b\bdone                            
+Writing inode tables:   0/128\b\b\b\b\b\b\b  1/128\b\b\b\b\b\b\b  2/128\b\b\b\b\b\b\b  3/128\b\b\b\b\b\b\b  4/128\b\b\b\b\b\b\b  5/128\b\b\b\b\b\b\b  6/128\b\b\b\b\b\b\b  7/128\b\b\b\b\b\b\b  8/128\b\b\b\b\b\b\b  9/128\b\b\b\b\b\b\b 10/128\b\b\b\b\b\b\b 11/128\b\b\b\b\b\b\b 12/128\b\b\b\b\b\b\b 13/128\b\b\b\b\b\b\b 14/128\b\b\b\b\b\b\b 15/128\b\b\b\b\b\b\b 16/128\b\b\b\b\b\b\b 17/128\b\b\b\b\b\b\b 18/128\b\b\b\b\b\b\b 19/128\b\b\b\b\b\b\b 20/128\b\b\b\b\b\b\b 21/128\b\b\b\b\b\b\b 22/128\b\b\b\b\b\b\b 23/128\b\b\b\b\b\b\b 24/128\b\b\b\b\b\b\b 25/128\b\b\b\b\b\b\b 26/128\b\b\b\b\b\b\b 27/128\b\b\b\b\b\b\b 28/128\b\b\b\b\b\b\b 29/128\b\b\b\b\b\b\b 30/128\b\b\b\b\b\b\b 31/128\b\b\b\b\b\b\b 32/128\b\b\b\b\b\b\b 33/128\b\b\b\b\b\b\b 34/128\b\b\b\b\b\b\b 35/128\b\b\b\b\b\b\b 36/128\b\b\b\b\b\b\b 37/128\b\b\b\b\b\b\b 38/128\b\b\b\b\b\b\b 39/128\b\b\b\b\b\b\b 40/128\b\b\b\b\b\b\b 41/128\b\b\b\b\b\b\b 42/128\b\b\b\b\b\b\b 43/128\b\b\b\b\b\b\b 44/128\b\b\b\b\b\b\b 45/128\b\b\b\b\b\b\b 46/128\b\b\b\b\b\b\b 47/128\b\b\b\b\b\b\b 48/128\b\b\b\b\b\b\b 49/128\b\b\b\b\b\b\b 50/128\b\b\b\b\b\b\b 51/128\b\b\b\b\b\b\b 52/128\b\b\b\b\b\b\b 53/128\b\b\b\b\b\b\b 54/128\b\b\b\b\b\b\b 55/128\b\b\b\b\b\b\b 56/128\b\b\b\b\b\b\b 57/128\b\b\b\b\b\b\b 58/128\b\b\b\b\b\b\b 59/128\b\b\b\b\b\b\b 60/128\b\b\b\b\b\b\b 61/128\b\b\b\b\b\b\b 62/128\b\b\b\b\b\b\b 63/128\b\b\b\b\b\b\b 64/128\b\b\b\b\b\b\b 65/128\b\b\b\b\b\b\b 66/128\b\b\b\b\b\b\b 67/128\b\b\b\b\b\b\b 68/128\b\b\b\b\b\b\b 69/128\b\b\b\b\b\b\b 70/128\b\b\b\b\b\b\b 71/128\b\b\b\b\b\b\b 72/128\b\b\b\b\b\b\b 73/128\b\b\b\b\b\b\b 74/128\b\b\b\b\b\b\b 75/128\b\b\b\b\b\b\b 76/128\b\b\b\b\b\b\b 77/128\b\b\b\b\b\b\b 78/128\b\b\b\b\b\b\b 79/128\b\b\b\b\b\b\b 80/128\b\b\b\b\b\b\b 81/128\b\b\b\b\b\b\b 82/128\b\b\b\b\b\b\b 83/128\b\b\b\b\b\b\b 84/128\b\b\b\b\b\b\b 85/128\b\b\b\b\b\b\b 86/128\b\b\b\b\b\b\b 87/128\b\b\b\b\b\b\b 88/128\b\b\b\b\b\b\b 89/128\b\b\b\b\b\b\b 90/128\b\b\b\b\b\b\b 91/128\b\b\b\b\b\b\b 92/128\b\b\b\b\b\b\b 93/128\b\b\b\b\b\b\b 94/128\b\b\b\b\b\b\b 95/128\b\b\b\b\b\b\b 96/128\b\b\b\b\b\b\b 97/128\b\b\b\b\b\b\b 98/128\b\b\b\b\b\b\b 99/128\b\b\b\b\b\b\b100/128\b\b\b\b\b\b\b101/128\b\b\b\b\b\b\b102/128\b\b\b\b\b\b\b103/128\b\b\b\b\b\b\b104/128\b\b\b\b\b\b\b105/128\b\b\b\b\b\b\b106/128\b\b\b\b\b\b\b107/128\b\b\b\b\b\b\b108/128\b\b\b\b\b\b\b109/128\b\b\b\b\b\b\b110/128\b\b\b\b\b\b\b111/128\b\b\b\b\b\b\b112/128\b\b\b\b\b\b\b113/128\b\b\b\b\b\b\b114/128\b\b\b\b\b\b\b115/128\b\b\b\b\b\b\b116/128\b\b\b\b\b\b\b117/128\b\b\b\b\b\b\b118/128\b\b\b\b\b\b\b119/128\b\b\b\b\b\b\b120/128\b\b\b\b\b\b\b121/128\b\b\b\b\b\b\b122/128\b\b\b\b\b\b\b123/128\b\b\b\b\b\b\b124/128\b\b\b\b\b\b\b125/128\b\b\b\b\b\b\b126/128\b\b\b\b\b\b\b127/128\b\b\b\b\b\b\b       \b\b\b\b\b\b\bdone                            
+Writing superblocks and filesystem accounting information:   0/128\b\b\b\b\b\b\b  1/128\b\b\b\b\b\b\b  2/128\b\b\b\b\b\b\b  3/128\b\b\b\b\b\b\b  4/128\b\b\b\b\b\b\b  5/128\b\b\b\b\b\b\b  6/128\b\b\b\b\b\b\b  7/128\b\b\b\b\b\b\b  8/128\b\b\b\b\b\b\b  9/128\b\b\b\b\b\b\b 10/128\b\b\b\b\b\b\b 11/128\b\b\b\b\b\b\b 12/128\b\b\b\b\b\b\b 13/128\b\b\b\b\b\b\b 14/128\b\b\b\b\b\b\b 15/128\b\b\b\b\b\b\b 16/128\b\b\b\b\b\b\b 17/128\b\b\b\b\b\b\b 18/128\b\b\b\b\b\b\b 19/128\b\b\b\b\b\b\b 20/128\b\b\b\b\b\b\b 21/128\b\b\b\b\b\b\b 22/128\b\b\b\b\b\b\b 23/128\b\b\b\b\b\b\b 24/128\b\b\b\b\b\b\b 25/128\b\b\b\b\b\b\b 26/128\b\b\b\b\b\b\b 27/128\b\b\b\b\b\b\b 28/128\b\b\b\b\b\b\b 29/128\b\b\b\b\b\b\b 30/128\b\b\b\b\b\b\b 31/128\b\b\b\b\b\b\b 32/128\b\b\b\b\b\b\b 33/128\b\b\b\b\b\b\b 34/128\b\b\b\b\b\b\b 35/128\b\b\b\b\b\b\b 36/128\b\b\b\b\b\b\b 37/128\b\b\b\b\b\b\b 38/128\b\b\b\b\b\b\b 39/128\b\b\b\b\b\b\b 40/128\b\b\b\b\b\b\b 41/128\b\b\b\b\b\b\b 42/128\b\b\b\b\b\b\b 43/128\b\b\b\b\b\b\b 44/128\b\b\b\b\b\b\b 45/128\b\b\b\b\b\b\b 46/128\b\b\b\b\b\b\b 47/128\b\b\b\b\b\b\b 48/128\b\b\b\b\b\b\b 49/128\b\b\b\b\b\b\b 50/128\b\b\b\b\b\b\b 51/128\b\b\b\b\b\b\b 52/128\b\b\b\b\b\b\b 53/128\b\b\b\b\b\b\b 54/128\b\b\b\b\b\b\b 55/128\b\b\b\b\b\b\b 56/128\b\b\b\b\b\b\b 57/128\b\b\b\b\b\b\b 58/128\b\b\b\b\b\b\b 59/128\b\b\b\b\b\b\b 60/128\b\b\b\b\b\b\b 61/128\b\b\b\b\b\b\b 62/128\b\b\b\b\b\b\b 63/128\b\b\b\b\b\b\b 64/128\b\b\b\b\b\b\b 65/128\b\b\b\b\b\b\b 66/128\b\b\b\b\b\b\b 67/128\b\b\b\b\b\b\b 68/128\b\b\b\b\b\b\b 69/128\b\b\b\b\b\b\b 70/128\b\b\b\b\b\b\b 71/128\b\b\b\b\b\b\b 72/128\b\b\b\b\b\b\b 73/128\b\b\b\b\b\b\b 74/128\b\b\b\b\b\b\b 75/128\b\b\b\b\b\b\b 76/128\b\b\b\b\b\b\b 77/128\b\b\b\b\b\b\b 78/128\b\b\b\b\b\b\b 79/128\b\b\b\b\b\b\b 80/128\b\b\b\b\b\b\b 81/128\b\b\b\b\b\b\b 82/128\b\b\b\b\b\b\b 83/128\b\b\b\b\b\b\b 84/128\b\b\b\b\b\b\b 85/128\b\b\b\b\b\b\b 86/128\b\b\b\b\b\b\b 87/128\b\b\b\b\b\b\b 88/128\b\b\b\b\b\b\b 89/128\b\b\b\b\b\b\b 90/128\b\b\b\b\b\b\b 91/128\b\b\b\b\b\b\b 92/128\b\b\b\b\b\b\b 93/128\b\b\b\b\b\b\b 94/128\b\b\b\b\b\b\b 95/128\b\b\b\b\b\b\b 96/128\b\b\b\b\b\b\b 97/128\b\b\b\b\b\b\b 98/128\b\b\b\b\b\b\b 99/128\b\b\b\b\b\b\b100/128\b\b\b\b\b\b\b101/128\b\b\b\b\b\b\b102/128\b\b\b\b\b\b\b103/128\b\b\b\b\b\b\b104/128\b\b\b\b\b\b\b105/128\b\b\b\b\b\b\b106/128\b\b\b\b\b\b\b107/128\b\b\b\b\b\b\b108/128\b\b\b\b\b\b\b109/128\b\b\b\b\b\b\b110/128\b\b\b\b\b\b\b111/128\b\b\b\b\b\b\b112/128\b\b\b\b\b\b\b113/128\b\b\b\b\b\b\b114/128\b\b\b\b\b\b\b115/128\b\b\b\b\b\b\b116/128\b\b\b\b\b\b\b117/128\b\b\b\b\b\b\b118/128\b\b\b\b\b\b\b119/128\b\b\b\b\b\b\b120/128\b\b\b\b\b\b\b121/128\b\b\b\b\b\b\b122/128\b\b\b\b\b\b\b123/128\b\b\b\b\b\b\b124/128\b\b\b\b\b\b\b125/128\b\b\b\b\b\b\b126/128\b\b\b\b\b\b\b127/128\b\b\b\b\b\b\b       \b\b\b\b\b\b\bdone
 
 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 448357852dfe7d67f062a8af26329b3d34e90c13..c04ed57c220cec76d06bc71c3a5d56e853941039 100644 (file)
--- 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/8\b\b\b1/8\b\b\b2/8\b\b\b3/8\b\b\b4/8\b\b\b5/8\b\b\b6/8\b\b\b7/8\b\b\b   \b\b\bdone                            
+Writing inode tables: 0/8\b\b\b1/8\b\b\b2/8\b\b\b3/8\b\b\b4/8\b\b\b5/8\b\b\b6/8\b\b\b7/8\b\b\b   \b\b\bdone                            
+Writing superblocks and filesystem accounting information: 0/8\b\b\b1/8\b\b\b2/8\b\b\b3/8\b\b\b4/8\b\b\b5/8\b\b\b6/8\b\b\b7/8\b\b\b   \b\b\bdone
 
 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 67cd33db4d2c44a438e33e73bb8f5061cf84e943..fe98b2d85f83f256c2e0fdf44429340663b44160 100644 (file)
--- 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\b\b\b\b\b 1/16\b\b\b\b\b 2/16\b\b\b\b\b 3/16\b\b\b\b\b 4/16\b\b\b\b\b 5/16\b\b\b\b\b 6/16\b\b\b\b\b 7/16\b\b\b\b\b 8/16\b\b\b\b\b 9/16\b\b\b\b\b10/16\b\b\b\b\b11/16\b\b\b\b\b12/16\b\b\b\b\b13/16\b\b\b\b\b14/16\b\b\b\b\b15/16\b\b\b\b\b     \b\b\b\b\bdone                            
+Writing inode tables:  0/16\b\b\b\b\b 1/16\b\b\b\b\b 2/16\b\b\b\b\b 3/16\b\b\b\b\b 4/16\b\b\b\b\b 5/16\b\b\b\b\b 6/16\b\b\b\b\b 7/16\b\b\b\b\b 8/16\b\b\b\b\b 9/16\b\b\b\b\b10/16\b\b\b\b\b11/16\b\b\b\b\b12/16\b\b\b\b\b13/16\b\b\b\b\b14/16\b\b\b\b\b15/16\b\b\b\b\b     \b\b\b\b\bdone                            
+Writing superblocks and filesystem accounting information:  0/16\b\b\b\b\b 1/16\b\b\b\b\b 2/16\b\b\b\b\b 3/16\b\b\b\b\b 4/16\b\b\b\b\b 5/16\b\b\b\b\b 6/16\b\b\b\b\b 7/16\b\b\b\b\b 8/16\b\b\b\b\b 9/16\b\b\b\b\b10/16\b\b\b\b\b11/16\b\b\b\b\b12/16\b\b\b\b\b13/16\b\b\b\b\b14/16\b\b\b\b\b15/16\b\b\b\b\b     \b\b\b\b\bdone
 
-Filesystem features: ext_attr resize_inode dir_index filetype sparse_super uninit_bg
+ 0/16\b\b\b\b\b 1/16\b\b\b\b\b 2/16\b\b\b\b\b 3/16\b\b\b\b\b 4/16\b\b\b\b\b 5/16\b\b\b\b\b 6/16\b\b\b\b\b 7/16\b\b\b\b\b 8/16\b\b\b\b\b 9/16\b\b\b\b\b10/16\b\b\b\b\b11/16\b\b\b\b\b12/16\b\b\b\b\b13/16\b\b\b\b\b14/16\b\b\b\b\b15/16\b\b\b\b\b     \b\b\b\b\bFilesystem features: ext_attr resize_inode dir_index filetype sparse_super uninit_bg
  
 Pass 1: Checking inodes, blocks, and sizes
 Pass 2: Checking directory structure