mke2fs: only print the low-level file system stats in verbose mode

Also print the file system UUID if it is non-NULL.

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

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index 97b601f9fe95a676b4aa55adaa892473224ee2c3..2c51999f870c265e73fafef705e4c2acbe48f7b6 100644 (file)
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -618,6 +618,14 @@ static void show_stats(ext2_filsys fs)
        dgrp_t                  i;
        int                     need, col_left;
 
+       if (!verbose) {
+               printf(_("Creating filesystem with %llu %dk blocks and "
+                        "%u inodes\n"),
+                      ext2fs_blocks_count(s), fs->blocksize >> 10,
+                      s->s_inodes_count);
+               goto skip_details;
+       }
+
        if (ext2fs_blocks_count(&fs_param) != ext2fs_blocks_count(s))
                fprintf(stderr, _("warning: %llu blocks unused.\n\n"),
                       ext2fs_blocks_count(&fs_param) - ext2fs_blocks_count(s));
@@ -666,11 +674,14 @@ static void show_stats(ext2_filsys fs)
                       s->s_blocks_per_group, s->s_clusters_per_group);
        printf(_("%u inodes per group\n"), s->s_inodes_per_group);
 
+skip_details:
        if (fs->group_desc_count == 1) {
                printf("\n");
                return;
        }
 
+       if (!e2p_is_null_uuid(s->s_uuid))
+               printf(_("Filesystem UUID: %s\n"), e2p_uuid2str(s->s_uuid));
        printf("%s", _("Superblock backups stored on blocks: "));
        group_block = s->s_first_data_block;
        col_left = 0;

diff --git a/tests/f_resize_inode/expect b/tests/f_resize_inode/expect
index 3fffe44dd2f62489cec539d1dfa46b5f7a7d093c..db57ed651ab0c8ecc360cd7d595afc965196cf22 100644 (file)
--- a/tests/f_resize_inode/expect
+++ b/tests/f_resize_inode/expect
@@ -1,16 +1,5 @@
 mke2fs -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 16384
-Filesystem label=
-OS type: Linux
-Block size=1024 (log=0)
-Fragment size=1024 (log=0)
-Stride=0 blocks, Stripe width=0 blocks
-4096 inodes, 16384 blocks
-819 blocks (5.00%) reserved for the super user
-First data block=1
-Maximum filesystem blocks=8421376
-16 block groups
-1024 blocks per group, 1024 fragments per group
-256 inodes per group
+Creating filesystem with 16384 1k blocks and 4096 inodes
 Superblock backups stored on blocks: 
        1025, 3073, 5121, 7169, 9217
 

diff --git a/tests/m_dasd_bs/expect.1 b/tests/m_dasd_bs/expect.1
index 0cbe339438bd43f74521cdef34593074e2b1490a..75a401d3816ece2b56fcdc9d07b6073696d57489 100644 (file)
--- a/tests/m_dasd_bs/expect.1
+++ b/tests/m_dasd_bs/expect.1
@@ -1,15 +1,4 @@
-Filesystem label=
-OS type: Linux
-Block size=2048 (log=1)
-Fragment size=2048 (log=1)
-Stride=0 blocks, Stripe width=0 blocks
-16384 inodes, 32768 blocks
-1638 blocks (5.00%) reserved for the super user
-First data block=0
-Maximum filesystem blocks=33554432
-2 block groups
-16384 blocks per group, 16384 fragments per group
-8192 inodes per group
+Creating filesystem with 32768 2k blocks and 16384 inodes
 Superblock backups stored on blocks: 
        16384
 

diff --git a/tests/m_desc_size_128/expect.1 b/tests/m_desc_size_128/expect.1
index 8f015913e421a7a3225ee34b8d3bec73ec630fe0..5a7da87b72d1d122bdffea33a1f1ab5126c74c29 100644 (file)
--- a/tests/m_desc_size_128/expect.1
+++ b/tests/m_desc_size_128/expect.1
@@ -1,15 +1,4 @@
-Filesystem label=
-OS type: Linux
-Block size=1024 (log=0)
-Fragment size=1024 (log=0)
-Stride=0 blocks, Stripe width=0 blocks
-8192 inodes, 131072 blocks
-6553 blocks (5.00%) reserved for the super user
-First data block=1
-Maximum filesystem blocks=2228224
-128 block groups
-1024 blocks per group, 1024 fragments per group
-64 inodes per group
+Creating filesystem with 131072 1k blocks and 8192 inodes
 Superblock backups stored on blocks: 
        1025, 3073, 5121, 7169, 9217, 25601, 27649, 50177, 82945, 128001
 

diff --git a/tests/m_extent_journal/expect.1 b/tests/m_extent_journal/expect.1
index d5d7a2443d082f9f27c55a6bf65fcb3542e9dd16..34e8a80d353dd03e9702f6acaa0a9d8ec6ff3ec6 100644 (file)
--- a/tests/m_extent_journal/expect.1
+++ b/tests/m_extent_journal/expect.1
@@ -1,15 +1,4 @@
-Filesystem label=
-OS type: Linux
-Block size=1024 (log=0)
-Fragment size=1024 (log=0)
-Stride=0 blocks, Stripe width=0 blocks
-16384 inodes, 65536 blocks
-3276 blocks (5.00%) reserved for the super user
-First data block=1
-Maximum filesystem blocks=67108864
-8 block groups
-8192 blocks per group, 8192 fragments per group
-2048 inodes per group
+Creating filesystem with 65536 1k blocks and 16384 inodes
 Superblock backups stored on blocks: 
        8193, 24577, 40961, 57345
 

diff --git a/tests/m_large_file/expect.1 b/tests/m_large_file/expect.1
index ced943171bdffd05d434d8ae8e0b3073a6d35ecf..8ab2711adb5eaaa748ea5d90782a6c8286badb08 100644 (file)
--- a/tests/m_large_file/expect.1
+++ b/tests/m_large_file/expect.1
@@ -1,15 +1,4 @@
-Filesystem label=
-OS type: Linux
-Block size=4096 (log=2)
-Fragment size=4096 (log=2)
-Stride=0 blocks, Stripe width=0 blocks
-64 inodes, 16384 blocks
-819 blocks (5.00%) reserved for the super user
-First data block=0
-Maximum filesystem blocks=16777216
-1 block group
-32768 blocks per group, 32768 fragments per group
-64 inodes per group
+Creating filesystem with 16384 4k blocks and 64 inodes
 
 Allocating group tables:    \b\b\bdone                            
 Writing inode tables:    \b\b\bdone                            

diff --git a/tests/m_meta_bg/expect.1 b/tests/m_meta_bg/expect.1
index ec10d6e02f8d14473fd2a1554f91ee9cf10559af..7df4230ca0bd1742788398888b1d521b390adbd8 100644 (file)
--- a/tests/m_meta_bg/expect.1
+++ b/tests/m_meta_bg/expect.1
@@ -1,14 +1,4 @@
-Filesystem label=
-OS type: Linux
-Block size=1024 (log=0)
-Fragment size=1024 (log=0)
-Stride=0 blocks, Stripe width=0 blocks
-32768 inodes, 131072 blocks
-6553 blocks (5.00%) reserved for the super user
-First data block=1
-128 block groups
-1024 blocks per group, 1024 fragments per group
-256 inodes per group
+Creating filesystem with 131072 1k blocks and 32768 inodes
 Superblock backups stored on blocks: 
        1025, 3073, 5121, 7169, 9217, 25601, 27649, 50177, 82945, 128001
 

diff --git a/tests/m_mmp/expect.1 b/tests/m_mmp/expect.1
index e18aa771c2915ccdbb20d4ee679892001b25a9b7..aec0a841d131b781a68ef3e44e6dd98668221c22 100644 (file)
--- a/tests/m_mmp/expect.1
+++ b/tests/m_mmp/expect.1
@@ -1,15 +1,4 @@
-Filesystem label=
-OS type: Linux
-Block size=4096 (log=2)
-Fragment size=4096 (log=2)
-Stride=0 blocks, Stripe width=0 blocks
-65536 inodes, 65536 blocks
-3276 blocks (5.00%) reserved for the super user
-First data block=0
-Maximum filesystem blocks=67108864
-2 block groups
-32768 blocks per group, 32768 fragments per group
-32768 inodes per group
+Creating filesystem with 65536 4k blocks and 65536 inodes
 Superblock backups stored on blocks: 
        32768
 

diff --git a/tests/m_no_opt/expect.1 b/tests/m_no_opt/expect.1
index e7bf2dbfb6575925cc216ecaf9009ac4227c3948..58b311c4eddfcdba1a0c435ebe3a5f210ff67fd5 100644 (file)
--- a/tests/m_no_opt/expect.1
+++ b/tests/m_no_opt/expect.1
@@ -1,14 +1,4 @@
-Filesystem label=
-OS type: Linux
-Block size=1024 (log=0)
-Fragment size=1024 (log=0)
-Stride=0 blocks, Stripe width=0 blocks
-16384 inodes, 65536 blocks
-3276 blocks (5.00%) reserved for the super user
-First data block=1
-8 block groups
-8192 blocks per group, 8192 fragments per group
-2048 inodes per group
+Creating filesystem with 65536 1k blocks and 16384 inodes
 Superblock backups stored on blocks: 
        8193, 16385, 24577, 32769, 40961, 49153, 57345
 

diff --git a/tests/m_quota/expect.1 b/tests/m_quota/expect.1
index 830046e7420e4e949005ddb638eba1f025e50605..a0f6501114f0eeb5bfcc907ddb2e9832a8fa8792 100644 (file)
--- a/tests/m_quota/expect.1
+++ b/tests/m_quota/expect.1
@@ -2,18 +2,7 @@
 Warning: the quota feature is still under development
 See https://ext4.wiki.kernel.org/index.php/Quota for more information
 
-Filesystem label=
-OS type: Linux
-Block size=1024 (log=0)
-Fragment size=1024 (log=0)
-Stride=0 blocks, Stripe width=0 blocks
-32768 inodes, 131072 blocks
-6553 blocks (5.00%) reserved for the super user
-First data block=1
-Maximum filesystem blocks=67371008
-16 block groups
-8192 blocks per group, 8192 fragments per group
-2048 inodes per group
+Creating filesystem with 131072 1k blocks and 32768 inodes
 Superblock backups stored on blocks: 
        8193, 24577, 40961, 57345, 73729
 

diff --git a/tests/m_raid_opt/expect.1 b/tests/m_raid_opt/expect.1
index 9548665ee5e44cb076c551f01c12312a5b437f82..0fccb7cadcbc7f24f30109cd807167a305cde07f 100644 (file)
--- a/tests/m_raid_opt/expect.1
+++ b/tests/m_raid_opt/expect.1
@@ -1,15 +1,4 @@
-Filesystem label=
-OS type: Linux
-Block size=1024 (log=0)
-Fragment size=1024 (log=0)
-Stride=13 blocks, Stripe width=0 blocks
-32768 inodes, 131072 blocks
-6553 blocks (5.00%) reserved for the super user
-First data block=1
-Maximum filesystem blocks=8519680
-128 block groups
-1024 blocks per group, 1024 fragments per group
-256 inodes per group
+Creating filesystem with 131072 1k blocks and 32768 inodes
 Superblock backups stored on blocks: 
        1025, 3073, 5121, 7169, 9217, 25601, 27649, 50177, 82945, 128001
 

diff --git a/tests/m_root_owner/expect.1 b/tests/m_root_owner/expect.1
index 72b0e0847c8ffb3f920cd512c40875f21ba4b968..cd949938d15085009773c44e135379636c0bbbde 100644 (file)
--- a/tests/m_root_owner/expect.1
+++ b/tests/m_root_owner/expect.1
@@ -1,16 +1,4 @@
-Filesystem label=
-OS type: Linux
-Block size=1024 (log=0)
-Fragment size=1024 (log=0)
-Stride=0 blocks, Stripe width=0 blocks
-128 inodes, 1024 blocks
-51 blocks (4.98%) reserved for the super user
-First data block=1
-Root directory owner=1234:1234
-Maximum filesystem blocks=1048576
-1 block group
-8192 blocks per group, 8192 fragments per group
-128 inodes per group
+Creating filesystem with 1024 1k blocks and 128 inodes
 
 Allocating group tables:    \b\b\bdone                            
 Writing inode tables:    \b\b\bdone                            

diff --git a/tests/m_std/expect.1 b/tests/m_std/expect.1
index f35653199d74bd91ed44492937f82ca23261284b..b05031f8e3157f8a604f1d1354b984d1f3acc02f 100644 (file)
--- a/tests/m_std/expect.1
+++ b/tests/m_std/expect.1
@@ -1,15 +1,4 @@
-Filesystem label=
-OS type: Linux
-Block size=1024 (log=0)
-Fragment size=1024 (log=0)
-Stride=0 blocks, Stripe width=0 blocks
-16384 inodes, 65536 blocks
-3276 blocks (5.00%) reserved for the super user
-First data block=1
-Maximum filesystem blocks=67108864
-8 block groups
-8192 blocks per group, 8192 fragments per group
-2048 inodes per group
+Creating filesystem with 65536 1k blocks and 16384 inodes
 Superblock backups stored on blocks: 
        8193, 24577, 40961, 57345
 

diff --git a/tests/m_uninit/expect.1 b/tests/m_uninit/expect.1
index 4af59556f7c6615488e7722929171cf8f5b35b5b..e886dfbf13736cd3ef3b03a471deb3fdaeed373b 100644 (file)
--- a/tests/m_uninit/expect.1
+++ b/tests/m_uninit/expect.1
@@ -1,15 +1,4 @@
-Filesystem label=
-OS type: Linux
-Block size=1024 (log=0)
-Fragment size=1024 (log=0)
-Stride=0 blocks, Stripe width=0 blocks
-32768 inodes, 131072 blocks
-6553 blocks (5.00%) reserved for the super user
-First data block=1
-Maximum filesystem blocks=67371008
-16 block groups
-8192 blocks per group, 8192 fragments per group
-2048 inodes per group
+Creating filesystem with 131072 1k blocks and 32768 inodes
 Superblock backups stored on blocks: 
        8193, 24577, 40961, 57345, 73729