diff options
| -rw-r--r-- | misc/mke2fs.c | 15 | ||||
| -rw-r--r-- | misc/tune2fs.c | 3 | ||||
| -rw-r--r-- | misc/util.c | 5 | ||||
| -rw-r--r-- | misc/util.h | 2 | ||||
| -rw-r--r-- | tests/m_extent_journal/expect.1 | 2 | ||||
| -rw-r--r-- | tests/m_uninit/expect.1 | 2 |
6 files changed, 15 insertions, 14 deletions
diff --git a/misc/mke2fs.c b/misc/mke2fs.c index cf9c3385..d011dcfc 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -2158,7 +2158,7 @@ int main (int argc, char *argv[]) ext2_filsys fs; badblocks_list bb_list = 0; unsigned int journal_blocks; - unsigned int i; + unsigned int i, max_mnt_count, checkinterval; int val, hash_alg; int flags; int old_bitmaps; @@ -2488,22 +2488,23 @@ no_journal: if (!quiet) printf(_("Writing superblocks and " "filesystem accounting information: ")); - retval = ext2fs_flush(fs); + checkinterval = fs->super->s_checkinterval; + max_mnt_count = fs->super->s_max_mnt_count; + retval = ext2fs_close(fs); if (retval) { fprintf(stderr, _("\nWarning, had trouble writing out superblocks.")); - } - if (!quiet) { + } else if (!quiet) { printf(_("done\n\n")); if (!getenv("MKE2FS_SKIP_CHECK_MSG")) - print_check_message(fs); + print_check_message(max_mnt_count, checkinterval); } - val = ext2fs_close(fs); + remove_error_table(&et_ext2_error_table); remove_error_table(&et_prof_error_table); profile_release(profile); for (i=0; fs_types[i]; i++) free(fs_types[i]); free(fs_types); - return (retval || val) ? 1 : 0; + return retval; } diff --git a/misc/tune2fs.c b/misc/tune2fs.c index 3c818988..6d879f34 100644 --- a/misc/tune2fs.c +++ b/misc/tune2fs.c @@ -607,7 +607,8 @@ static void add_journal(ext2_filsys fs) if ((mount_flags & EXT2_MF_MOUNTED) == 0) fs->flags &= ~EXT2_FLAG_SUPER_ONLY; } - print_check_message(fs); + print_check_message(fs->super->s_max_mnt_count, + fs->super->s_checkinterval); return; err: diff --git a/misc/util.c b/misc/util.c index 51bdb60f..f3ee2bb9 100644 --- a/misc/util.c +++ b/misc/util.c @@ -282,12 +282,11 @@ unsigned int figure_journal_size(int size, ext2_filsys fs) return j_blocks; } -void print_check_message(ext2_filsys fs) +void print_check_message(unsigned int mnt, unsigned int check) { printf(_("This filesystem will be automatically " "checked every %d mounts or\n" "%g days, whichever comes first. " "Use tune2fs -c or -i to override.\n"), - fs->super->s_max_mnt_count, - (double)fs->super->s_checkinterval / (3600 * 24)); + mnt, ((double) check) / (3600 * 24)); } diff --git a/misc/util.h b/misc/util.h index e0c99f6c..d05f17e4 100644 --- a/misc/util.h +++ b/misc/util.h @@ -23,4 +23,4 @@ extern void check_plausibility(const char *device); extern void parse_journal_opts(const char *opts); extern void check_mount(const char *device, int force, const char *type); extern unsigned int figure_journal_size(int size, ext2_filsys fs); -extern void print_check_message(ext2_filsys fs); +extern void print_check_message(unsigned int, unsigned int); diff --git a/tests/m_extent_journal/expect.1 b/tests/m_extent_journal/expect.1 index 88ea2d91..a8c5b63c 100644 --- a/tests/m_extent_journal/expect.1 +++ b/tests/m_extent_journal/expect.1 @@ -18,7 +18,7 @@ Writing inode tables: 0/81/82/83/84/85/86/87/8 done Creating journal (4096 blocks): done Writing superblocks and filesystem accounting information: 0/81/82/83/84/85/86/87/8 done -0/81/82/83/84/85/86/87/8 Filesystem features: has_journal ext_attr resize_inode dir_index filetype extent sparse_super +Filesystem features: has_journal ext_attr resize_inode dir_index filetype extent sparse_super Pass 1: Checking inodes, blocks, and sizes Pass 2: Checking directory structure diff --git a/tests/m_uninit/expect.1 b/tests/m_uninit/expect.1 index 173c0729..a3c059db 100644 --- a/tests/m_uninit/expect.1 +++ b/tests/m_uninit/expect.1 @@ -17,7 +17,7 @@ Allocating group tables: 0/16 1/16 2/16 3/16 4/16 5/16 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 - 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 +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 |