ChangeLog, tune2fs.8.in:

  tune2fs.8.in: Add description of the -j option.
tune2fs.c:
  Minor whitespace and option ordering fixes from Andreas Dilger

diff --git a/misc/ChangeLog b/misc/ChangeLog
index ee599c4..042fbd7 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,5 +1,7 @@
 2001-01-14  Theodore Ts'o  <tytso@valinux.com>
 
+       * tune2fs.8.in: Add description of the -j option.
+
        * tune2fs.c (add_journal): Minor fixes from Andreas Dilger. Flush
                stdout after printing in-progress message.  
                (main): Exit with status code 1 if we failed to determine

diff --git a/misc/tune2fs.8.in b/misc/tune2fs.8.in
index fcf1057..b3d030e 100644 (file)
--- a/misc/tune2fs.8.in
+++ b/misc/tune2fs.8.in
@@ -23,6 +23,10 @@ tune2fs \- adjust tunable filesystem parameters on second extended filesystems
 .I interval-between-checks
 ]
 [
+.B \-j
+.I journal-options
+]
+[
 .B \-m
 .I reserved-blocks-percentage
 ]
@@ -102,6 +106,27 @@ in months, and
 .B w
 in weeks.  A value of zero will disable the timedependent checking.
 .TP
+.BR \-j " journal_options"
+add a journal inode or device to the filesystem.  
+Journal options are comma
+separated, and may take an argument using the equals ('=')  sign.
+Currently two options are supported,
+.I size
+and
+.IR device .
+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 
+journal in MB (1024*1024 bytes).  Any size between 4MB and 100MB may be used.
+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 (external 
+to the filesystem) which will contain the external journal.  
+.TP
 .B \-l
 list the contents of the filesystem superblock.
 .TP

diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index e439511..81b06e0 100644 (file)
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -168,7 +168,7 @@ static void update_feature_set(ext2_filsys fs, char *features)
                 */
                if (!journal_opts)
                        journal_opts = "size=16";
-               sb->s_feature_compat &=~EXT3_FEATURE_COMPAT_HAS_JOURNAL;
+               sb->s_feature_compat &= ~EXT3_FEATURE_COMPAT_HAS_JOURNAL;
                journal = old_journal;
        }
        
@@ -371,13 +371,13 @@ static void parse_tune2fs_options(int argc, char **argv)
                                i_flag = 1;
                                open_flag = EXT2_FLAG_RW;
                                break;
-                       case 'l':
-                               l_flag = 1;
-                               break;
                        case 'j':
                                journal_opts = optarg;
                                open_flag = EXT2_FLAG_RW;
                                break;
+                       case 'l':
+                               l_flag = 1;
+                               break;
                        case 'L':
                                new_label = optarg;
                                L_flag = 1;