mke2fs: throttle allocating groups progress as well

Throttle updates for the "Allocating Groups" progress updates to once
a second as well.  We now do this throttling in libext2fs, so we don't
have to do this for each of mke2fs's progress updates, and because the
updates from ext2fs_allocate_tables() come from within libext2fs
anyway.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/lib/ext2fs/progress.c b/lib/ext2fs/progress.c
index 37d1509..1e791fe 100644 (file)
--- a/lib/ext2fs/progress.c
+++ b/lib/ext2fs/progress.c
@@ -14,6 +14,8 @@
 #include "ext2fs.h"
 #include "ext2fsP.h"
 
+#include <time.h>
+
 static char spaces[80], backspaces[80];
 
 static int int_log10(unsigned int arg)
@@ -64,10 +66,16 @@ void ext2fs_numeric_progress_update(ext2_filsys fs,
                                    struct ext2fs_numeric_progress_struct * progress,
                                    __u64 val)
 {
+       static time_t now, last_update = 0;
+
        if (!(fs->flags & EXT2_FLAG_PRINT_PROGRESS))
                return;
        if (progress->skip_progress)
                return;
+       now = time(0);
+       if (now == last_update)
+               return;
+       last_update = now;
 
        printf("%*llu/%*llu", progress->log_max, val,
               progress->log_max, progress->max);

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index 7d597a4..d7e51fc 100644 (file)
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -310,7 +310,6 @@ static void write_inode_tables(ext2_filsys fs, int lazy_flag, int itable_zeroed)
        errcode_t       retval;
        blk64_t         blk;
        dgrp_t          i;
-       time_t          now, last_update = 0;
        int             num;
        struct ext2fs_numeric_progress_struct progress;
 
@@ -319,11 +318,8 @@ static void write_inode_tables(ext2_filsys fs, int lazy_flag, int itable_zeroed)
                                     fs->group_desc_count);
 
        for (i = 0; i < fs->group_desc_count; i++) {
-               now = time(0);
-               if (now != last_update && no_progress) {
+               if (!no_progress)
                        ext2fs_numeric_progress_update(fs, &progress, i);
-                       last_update = now;
-               }
 
                blk = ext2fs_inode_table_loc(fs, i);
                num = fs->inode_blocks_per_group;
@@ -2145,7 +2141,6 @@ static int mke2fs_discard_device(ext2_filsys fs)
        blk64_t count = DISCARD_STEP_MB;
        blk64_t cur;
        int retval = 0;
-       time_t now, last_update = 0;
 
        /*
         * Let's try if discard really works on the device, so
@@ -2164,11 +2159,8 @@ static int mke2fs_discard_device(ext2_filsys fs)
                                     _("Discarding device blocks: "),
                                     blocks);
        while (cur < blocks) {
-               now = time(0);
-               if (now != last_update && !no_progress) {
+               if (!no_progress)
                        ext2fs_numeric_progress_update(fs, &progress, cur);
-                       last_update = now;
-               }
 
                if (cur + count > blocks)
                        count = blocks - cur;

diff --git a/tests/f_resize_inode/expect b/tests/f_resize_inode/expect
index bbbad60..3fffe44 100644 (file)
--- a/tests/f_resize_inode/expect
+++ b/tests/f_resize_inode/expect
@@ -14,9 +14,9 @@ Maximum filesystem blocks=8421376
 Superblock backups stored on blocks: 
        1025, 3073, 5121, 7169, 9217
 
-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                            
+Allocating group tables:      \b\b\b\b\bdone                            
 Writing inode tables:      \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
+Writing superblocks and filesystem accounting information:      \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 a9a2c35..61f6894 100644 (file)
--- a/tests/m_dasd_bs/expect.1
+++ b/tests/m_dasd_bs/expect.1
@@ -13,9 +13,9 @@ Maximum filesystem blocks=33554432
 Superblock backups stored on blocks: 
        16384
 
-Allocating group tables: 0/2\b\b\b1/2\b\b\b   \b\b\bdone                            
+Allocating group tables:    \b\b\bdone                            
 Writing inode tables:    \b\b\bdone                            
-Writing superblocks and filesystem accounting information: 0/2\b\b\b1/2\b\b\b   \b\b\bdone
+Writing superblocks and filesystem accounting information:    \b\b\bdone
 
 Filesystem features: ext_attr resize_inode dir_index filetype sparse_super
  

diff --git a/tests/m_extent_journal/expect.1 b/tests/m_extent_journal/expect.1
index 9bcac12..aaedf72 100644 (file)
--- a/tests/m_extent_journal/expect.1
+++ b/tests/m_extent_journal/expect.1
@@ -13,10 +13,10 @@ Maximum filesystem blocks=67108864
 Superblock backups stored on blocks: 
        8193, 24577, 40961, 57345
 
-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                            
+Allocating group tables:    \b\b\bdone                            
 Writing inode tables:    \b\b\bdone                            
 Creating journal (4096 blocks): done
-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
+Writing superblocks and filesystem accounting information:    \b\b\bdone
 
 Filesystem features: has_journal ext_attr resize_inode dir_index filetype extent sparse_super
  

diff --git a/tests/m_large_file/expect.1 b/tests/m_large_file/expect.1
index c93183b..59a9b7f 100644 (file)
--- a/tests/m_large_file/expect.1
+++ b/tests/m_large_file/expect.1
@@ -11,9 +11,9 @@ Maximum filesystem blocks=16777216
 32768 blocks per group, 32768 fragments per group
 64 inodes per group
 
-Allocating group tables: 0/1\b\b\b   \b\b\bdone                            
+Allocating group tables:    \b\b\bdone                            
 Writing inode tables:    \b\b\bdone                            
-Writing superblocks and filesystem accounting information: 0/1\b\b\b   \b\b\bdone
+Writing superblocks and filesystem accounting information:    \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 49f5898..e7c2b2c 100644 (file)
--- a/tests/m_meta_bg/expect.1
+++ b/tests/m_meta_bg/expect.1
@@ -12,9 +12,9 @@ First data block=1
 Superblock backups stored on blocks: 
        1025, 3073, 5121, 7169, 9217, 25601, 27649, 50177, 82945, 128001
 
-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                            
+Allocating group tables:        \b\b\b\b\b\b\bdone                            
 Writing inode tables:        \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
+Writing superblocks and filesystem accounting information:        \b\b\b\b\b\b\bdone
 
 Filesystem features: ext_attr dir_index filetype meta_bg sparse_super
  

diff --git a/tests/m_mmp/expect.1 b/tests/m_mmp/expect.1
index 63995bb..1f7737d 100644 (file)
--- a/tests/m_mmp/expect.1
+++ b/tests/m_mmp/expect.1
@@ -13,10 +13,10 @@ Maximum filesystem blocks=67108864
 Superblock backups stored on blocks: 
        32768
 
-Allocating group tables: 0/2\b\b\b1/2\b\b\b   \b\b\bdone                            
+Allocating group tables:    \b\b\bdone                            
 Writing inode tables:    \b\b\bdone                            
 Multiple mount protection is enabled with update interval 5 seconds.
-Writing superblocks and filesystem accounting information: 0/2\b\b\b1/2\b\b\b   \b\b\bdone
+Writing superblocks and filesystem accounting information:    \b\b\bdone
 
 Filesystem features: ext_attr resize_inode dir_index filetype mmp sparse_super large_file
  

diff --git a/tests/m_no_opt/expect.1 b/tests/m_no_opt/expect.1
index 1379827..8fa605b 100644 (file)
--- a/tests/m_no_opt/expect.1
+++ b/tests/m_no_opt/expect.1
@@ -12,9 +12,9 @@ First data block=1
 Superblock backups stored on blocks: 
        8193, 16385, 24577, 32769, 40961, 49153, 57345
 
-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                            
+Allocating group tables:    \b\b\bdone                            
 Writing inode tables:    \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
+Writing superblocks and filesystem accounting information:    \b\b\bdone
 
 Filesystem features:(none)
  

diff --git a/tests/m_raid_opt/expect.1 b/tests/m_raid_opt/expect.1
index 1cc3330..0c35700 100644 (file)
--- a/tests/m_raid_opt/expect.1
+++ b/tests/m_raid_opt/expect.1
@@ -13,9 +13,9 @@ Maximum filesystem blocks=8519680
 Superblock backups stored on blocks: 
        1025, 3073, 5121, 7169, 9217, 25601, 27649, 50177, 82945, 128001
 
-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                            
+Allocating group tables:        \b\b\b\b\b\b\bdone                            
 Writing inode tables:        \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
+Writing superblocks and filesystem accounting information:        \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 b0bcf52..23876ec 100644 (file)
--- a/tests/m_std/expect.1
+++ b/tests/m_std/expect.1
@@ -13,9 +13,9 @@ Maximum filesystem blocks=67108864
 Superblock backups stored on blocks: 
        8193, 24577, 40961, 57345
 
-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                            
+Allocating group tables:    \b\b\bdone                            
 Writing inode tables:    \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
+Writing superblocks and filesystem accounting information:    \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 d7971f1..f285214 100644 (file)
--- a/tests/m_uninit/expect.1
+++ b/tests/m_uninit/expect.1
@@ -13,9 +13,9 @@ Maximum filesystem blocks=67371008
 Superblock backups stored on blocks: 
        8193, 24577, 40961, 57345, 73729
 
-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                            
+Allocating group tables:      \b\b\b\b\bdone                            
 Writing inode tables:      \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
+Writing superblocks and filesystem accounting information:      \b\b\b\b\bdone
 
 Filesystem features: ext_attr resize_inode dir_index filetype sparse_super uninit_bg