diff --git a/misc/mke2fs.c b/misc/mke2fs.c index 4250335c..7d597a42 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -94,6 +94,7 @@ int lazy_itable_init; char *bad_blocks_filename; __u32 fs_stride; int quotatype = -1; /* Initialize both user and group quotas by default */ +int no_progress; struct ext2_super_block fs_param; char *fs_uuid = NULL; @@ -319,7 +320,7 @@ static void write_inode_tables(ext2_filsys fs, int lazy_flag, int itable_zeroed) for (i = 0; i < fs->group_desc_count; i++) { now = time(0); - if (now != last_update) { + if (now != last_update && no_progress) { ext2fs_numeric_progress_update(fs, &progress, i); last_update = now; } @@ -534,7 +535,8 @@ static void create_journal_dev(ext2_filsys fs) } blk += c; count -= c; - ext2fs_numeric_progress_update(fs, &progress, blk); + if (!no_progress) + ext2fs_numeric_progress_update(fs, &progress, blk); } ext2fs_zero_blocks2(0, 0, 0, 0, 0); @@ -1891,6 +1893,8 @@ profile_error: blocksize, sys_page_size); } + profile_get_boolean(profile, "options", "no_progress", 0, 0, + &no_progress); lazy_itable_init = 0; if (access("/sys/fs/ext4/features/lazy_itable_init", R_OK) == 0) lazy_itable_init = 1; @@ -2161,7 +2165,7 @@ static int mke2fs_discard_device(ext2_filsys fs) blocks); while (cur < blocks) { now = time(0); - if (now != last_update) { + if (now != last_update && !no_progress) { ext2fs_numeric_progress_update(fs, &progress, cur); last_update = now; } diff --git a/tests/f_resize_inode/expect b/tests/f_resize_inode/expect index 84618d4d..bbbad603 100644 --- a/tests/f_resize_inode/expect +++ b/tests/f_resize_inode/expect @@ -15,7 +15,7 @@ Superblock backups stored on blocks: 1025, 3073, 5121, 7169, 9217 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 inode tables: 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 diff --git a/tests/m_dasd_bs/expect.1 b/tests/m_dasd_bs/expect.1 index 31db54b7..a9a2c35b 100644 --- a/tests/m_dasd_bs/expect.1 +++ b/tests/m_dasd_bs/expect.1 @@ -14,7 +14,7 @@ Superblock backups stored on blocks: 16384 Allocating group tables: 0/21/2 done -Writing inode tables: 0/21/2 done +Writing inode tables: 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_extent_journal/expect.1 b/tests/m_extent_journal/expect.1 index a8c5b63c..9bcac124 100644 --- a/tests/m_extent_journal/expect.1 +++ b/tests/m_extent_journal/expect.1 @@ -14,7 +14,7 @@ Superblock backups stored on blocks: 8193, 24577, 40961, 57345 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 inode tables: done Creating journal (4096 blocks): done Writing superblocks and filesystem accounting information: 0/81/82/83/84/85/86/87/8 done diff --git a/tests/m_large_file/expect.1 b/tests/m_large_file/expect.1 index 2b40c84c..c93183bb 100644 --- a/tests/m_large_file/expect.1 +++ b/tests/m_large_file/expect.1 @@ -12,7 +12,7 @@ Maximum filesystem blocks=16777216 64 inodes per group Allocating group tables: 0/1 done -Writing inode tables: 0/1 done +Writing inode tables: 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 f1c9cef1..49f58981 100644 --- a/tests/m_meta_bg/expect.1 +++ b/tests/m_meta_bg/expect.1 @@ -13,7 +13,7 @@ Superblock backups stored on blocks: 1025, 3073, 5121, 7169, 9217, 25601, 27649, 50177, 82945, 128001 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 inode tables: 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_mmp/expect.1 b/tests/m_mmp/expect.1 index d3319b3f..63995bbb 100644 --- a/tests/m_mmp/expect.1 +++ b/tests/m_mmp/expect.1 @@ -14,7 +14,7 @@ Superblock backups stored on blocks: 32768 Allocating group tables: 0/21/2 done -Writing inode tables: 0/21/2 done +Writing inode tables: done Multiple mount protection is enabled with update interval 5 seconds. Writing superblocks and filesystem accounting information: 0/21/2 done diff --git a/tests/m_no_opt/expect.1 b/tests/m_no_opt/expect.1 index 7f3e5aa7..13798274 100644 --- a/tests/m_no_opt/expect.1 +++ b/tests/m_no_opt/expect.1 @@ -13,7 +13,7 @@ Superblock backups stored on blocks: 8193, 16385, 24577, 32769, 40961, 49153, 57345 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 inode tables: 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 0c6acc16..1cc33301 100644 --- a/tests/m_raid_opt/expect.1 +++ b/tests/m_raid_opt/expect.1 @@ -14,7 +14,7 @@ Superblock backups stored on blocks: 1025, 3073, 5121, 7169, 9217, 25601, 27649, 50177, 82945, 128001 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 inode tables: 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 d0bf27c8..b0bcf527 100644 --- a/tests/m_std/expect.1 +++ b/tests/m_std/expect.1 @@ -14,7 +14,7 @@ Superblock backups stored on blocks: 8193, 24577, 40961, 57345 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 inode tables: 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 a3c059db..d7971f17 100644 --- a/tests/m_uninit/expect.1 +++ b/tests/m_uninit/expect.1 @@ -14,7 +14,7 @@ Superblock backups stored on blocks: 8193, 24577, 40961, 57345, 73729 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 inode tables: 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 diff --git a/tests/mke2fs.conf.in b/tests/mke2fs.conf.in index fbe2e2a7..c06050d8 100644 --- a/tests/mke2fs.conf.in +++ b/tests/mke2fs.conf.in @@ -6,6 +6,7 @@ reserved_ratio = 5.0 enable_periodic_fsck = true lazy_itable_init = false + no_discard = true default_mntopts = ^acl [fs_types]