Update and clarify man pages (addresses Debian Bug #145044).

Let e2fsck allow use of the TEA hash.

Mke2fs will no longer abort if it can't zero blocks at the end of the
filesystem.  (Addresses Debian Bug #155007)

diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index 8e58a03..f9c834c 100644 (file)
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,5 +1,10 @@
 2002-08-17  Theodore Ts'o  <tytso@mit.edu>
 
+       * e2fsck.8.in: Add clarifying text describing how e2fsck works
+               with ext3 filesytems.  (Addresses Debian bug #145044).
+
+       * pass1.c (handle_htree): Add support for EXT2_HASH_TEA
+
        * e2fsck.h, e2fsck.c (e2fsck_allocate_context): Add new field to
                the e2fsck context, ext_attr_ver, which specifies the EA
                format version.

diff --git a/e2fsck/e2fsck.8.in b/e2fsck/e2fsck.8.in
index 7059626..6f9aca8 100644 (file)
--- a/e2fsck/e2fsck.8.in
+++ b/e2fsck/e2fsck.8.in
@@ -37,9 +37,18 @@ e2fsck \- check a Linux second extended file system
 .I device
 .SH DESCRIPTION
 .B e2fsck
-is used to check a Linux second extended file system (e2fs).  E2fsck also 
+is used to check a Linux second extended file system (ext2fs).  
+.B E2fsck
+also 
 supports ext2 filesystems countaining a journal, which are
-also sometimes known as ext3 filesystems.
+also sometimes known as ext3 filesystems, by first applying the journal 
+to the filesystem before continuing with normal 
+.B e2fsck
+processing.  After the journal has been applied, a filesystem will
+normally be marked as clean.  Hence, for ext3 filesystems, 
+.B e2fsck
+will normally run the journal and exit, unless its superblock
+indicates that further checking is required.
 .PP
 .I device
 is the device file where the filesystem is stored (e.g.

diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index a0e39b7..693031f 100644 (file)
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -1179,6 +1179,7 @@ static int handle_htree(e2fsck_t ctx, struct problem_context *pctx,
        pctx->num = root->hash_version;
        if ((root->hash_version != EXT2_HASH_LEGACY) &&
            (root->hash_version != EXT2_HASH_HALF_MD4) &&
+           (root->hash_version != EXT2_HASH_TEA) &&
            fix_problem(ctx, PR_1_HTREE_HASHV, pctx))
                return 1;
                

diff --git a/misc/ChangeLog b/misc/ChangeLog
index a10ecc0..59325b6 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,13 @@
+2002-08-17  Theodore Ts'o  <tytso@mit.edu>
+
+       * fsck.8.in: Fix typo in man page, and clarified text regarding
+               options specifiers for -t option.  (Addresses Debian bug 
+               #145044)
+
+       * mke2fs.c (main): If there is a problem zeroing blocks at the end
+               of the filesystem, don't abort mke2fs.  Addresses Debian
+               bug #155007.
+
 2002-08-16  Theodore Ts'o  <tytso@mit.edu>
 
        * e2image.c (write_raw_image_file): Check for an extended

diff --git a/misc/fsck.8.in b/misc/fsck.8.in
index fd136ec..10a19dc 100644 (file)
--- a/misc/fsck.8.in
+++ b/misc/fsck.8.in
@@ -16,11 +16,11 @@ fsck \- check and repair a Linux file system
 ] 
 .I filesys [ ... ]
 [\-\-] [
-.B fsck-options
+.B fs-specific-options
 ]
 .SH DESCRIPTION
 .B fsck
-is used to check and optionally repair a one or more Linux file systems.  
+is used to check and optionally repair one or more Linux file systems.  
 .I filesys
 can be a device name (e.g.
 .IR /dev/hdc1 ", " /dev/sdb2 ),
@@ -76,7 +76,7 @@ further details.
 .B \-s
 Serialize 
 .B fsck 
-operations.  This is a good idea if you checking multiple
+operations.  This is a good idea if you are checking multiple
 filesystems and the checkers are in an interactive mode.  (Note:
 .BR e2fsck (8)
 runs in an interactive mode by default.  To make 
@@ -115,16 +115,28 @@ will be checked.
 Options specifiers may be included in the comma separated
 .IR fslist .
 They must have the format 
-.BI opts= fs-option\fR,
-and may be prefixed by a negation operator.  If an options specifier is
-present, then only filesystems whose 
+.BI opts= fs-option\fR.
+If an options specifier is present, then only filesystems which contain
+.I fs-option
+in their mount options field of 
 .B /etc/fstab
-entry do (or do not, if the options specifier was prefixed by a negation
-operator) contain 
+will be checked.  If the options specifier is prefixed by a negation
+operator, then only 
+those filesystems that do not have
 .I fs-option
-in their options field of the
+in their mount options field of
+.B /etc/fstab 
+will be checked.
+.sp
+For example, if
+.B opts=ro
+appears in
+.IR fslist ,
+then only filesystems listed in
 .B /etc/fstab 
-file will be checked.
+with the
+.B ro
+option will be checked.
 .sp
 For compatibility with Mandrake distributions whose boot scripts
 depend upon an unauthorized UI change to the
@@ -228,8 +240,8 @@ Don't show the title on startup.
 Produce verbose output, including all file system-specific commands
 that are executed.
 .TP
-.B fsck-options
-Options which which are not understood by 
+.B fs-specific-options
+Options which are not understood by 
 .B fsck 
 are passed to the filesystem-specific checker.  These arguments
 .B must

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index 22d1ae7..0f5f1e0 100644 (file)
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -404,10 +404,9 @@ static errcode_t zero_blocks(ext2_filsys fs, blk_t blk, int num,
        if (next_update_incr < 1)
                next_update_incr = 1;
        for (j=0; j < num; j += STRIDE_LENGTH, blk += STRIDE_LENGTH) {
-               if (num-j > STRIDE_LENGTH)
+               count = num - j;
+               if (count > STRIDE_LENGTH)
                        count = STRIDE_LENGTH;
-               else
-                       count = num - j;
                retval = io_channel_write_blk(fs->io, blk, count, buf);
                if (retval) {
                        if (ret_count)
@@ -1340,9 +1339,8 @@ int main (int argc, char *argv[])
 
                if (retval) {
                        com_err(program_name, retval,
-                               _("zeroing block %u at end of filesystem"),
+                               _("while zeroing block %u at end of filesystem"),
                                ret_blk);
-                       exit(1);
                }
                write_inode_tables(fs);
                create_root_dir(fs);

diff --git a/misc/tune2fs.8.in b/misc/tune2fs.8.in
index 7437994..3a15a58 100644 (file)
--- a/misc/tune2fs.8.in
+++ b/misc/tune2fs.8.in
@@ -340,7 +340,7 @@ is converted to a numerical uid before it is stored in the superblock.
 .BI \-U " UUID"
 Set the universally unique identifier (UUID) of the filesystem to
 .IR UUID .
-The format of the UUID is a series of hex digits separated by hypthens, 
+The format of the UUID is a series of hex digits separated by hyphens, 
 like this: 
 "c1b9d5a2-f162-11cf-9ece-0020afc76f16".  
 The