ChangeLog, mke2fs.c:

  mke2fs.c (usage): Document the -j option.
  (main): Print the number blocks used in the journal.
ChangeLog, mke2fs.8.in:
  Minor clarity edits.

diff --git a/misc/ChangeLog b/misc/ChangeLog
index f13d499..e87635c 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,10 @@
+2000-12-30    <tytso@snap.thunk.org>
+
+       * mke2fs.8.in: Minor clarity edit.
+
+       * mke2fs.c (usage): Document the -j option.
+               (main): Print the number blocks used in the journal.
+
 2000-12-28    <tytso@snap.thunk.org>
 
        * base_device.c (base_device): Add support for DAC960 device

diff --git a/misc/mke2fs.8.in b/misc/mke2fs.8.in
index f54d15f..99d209d 100644 (file)
--- a/misc/mke2fs.8.in
+++ b/misc/mke2fs.8.in
@@ -146,7 +146,8 @@ Currently two options are supported,
 .I size
 and
 .IR device .
-One of these two options must be specified when building the journal.
+One these two options must be specified when 
+building the journal.
 The 
 .I size 
 option takes a numerical argument which specifies the size of the 
@@ -155,9 +156,8 @@ Use of this option implies that the journal will be stored in the
 filesystem, so it must be small enough to fit into the filesystem.
 The 
 .I device
-option takes a filename which specifies a block device which will contain 
-the journal.  This option of course implies that the journal will be 
-stored external to the filesystem.
+option takes a filename which specifies a block device (external 
+to the filesystem) which will contain the external journal.  
 .TP
 .B \-n
 causes mke2fs to not actually create a filesystem, but display what it 

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index 66e2f3b..fe81afa 100644 (file)
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -97,7 +97,7 @@ static void check_mount(const char *device);
 static void usage(NOARGS)
 {
        fprintf(stderr, _("Usage: %s [-c|-t|-l filename] [-b block-size] "
-       "[-f fragment-size]\n\t[-i bytes-per-inode] "
+       "[-f fragment-size]\n\t[-i bytes-per-inode] [-j journal-options]"
        " [-N number-of-inodes]\n\t[-m reserved-blocks-percentage] "
        "[-o creator-os] [-g blocks-per-group]\n\t[-L volume-label] "
        "[-M last-mounted-directory] [-O feature[,...]]\n\t"
@@ -1224,7 +1224,8 @@ int main (int argc, char *argv[])
                        printf(_("done\n"));
        } else if (journal_size) {
                if (!quiet)
-                       printf(_("Creating journal: "));
+                       printf(_("Creating journal (%d blocks): "),
+                              journal_blocks);
                retval = ext2fs_add_journal_fs(fs, journal_blocks,
                                               journal_flags);
                if (retval) {