ChangeLog, super.c:

  super.c: Minor whitespace cleanups, from Andreas Dilger.
mtrace.h:
  mtrace.h: Minor whitespace cleanups, from Andreas Dilger.
ChangeLog, message.c:
  message.c (special_inode_name): Add more special inode names (From
  	Andreas Dilger)

diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index df1d0c2af48de10d0864a5fa439461e5168969bd..4d128a230fffb1f9f7d65cec6d1c671f1145f869 100644 (file)
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,10 +1,14 @@
 2001-01-12  Theodore Ts'o  <tytso@valinux.com>
 
+       * message.c (special_inode_name): Add more special inode names
+               (From Andreas Dilger)
+
        * util.c (fatal_error): Check to make sure the io_manager data
                structure is sane before trying to flush the io_channel.
                (From Andreas Dilger)
 
-       * pass2.c: Minor whitespace cleanups, from Andreas Dilger.
+       * mtrace.h, super.c, pass2.c: Minor whitespace cleanups, from
+               Andreas Dilger.
 
        * journal.c (e2fsck_journal_fix_bad_inode): Set pctx->ino to the
                bad journal number.

diff --git a/e2fsck/message.c b/e2fsck/message.c
index 0bb666a53eba6a0177d5c1f6c70b36eb74f9c17b..26a7c023bb38b2e81b9a9a4a830896a040e6265b 100644 (file)
--- a/e2fsck/message.c
+++ b/e2fsck/message.c
@@ -130,7 +130,7 @@ static const char *abbrevs[] = {
 /*
  * Give more user friendly names to the "special" inodes.
  */
-#define num_special_inodes     7
+#define num_special_inodes     11
 static const char *special_inode_name[] =
 {
        N_("<The NULL inode>"),                 /* 0 */
@@ -139,7 +139,11 @@ static const char *special_inode_name[] =
        N_("<The ACL index inode>"),            /* 3 */
        N_("<The ACL data inode>"),             /* 4 */
        N_("<The boot loader inode>"),          /* 5 */
-       N_("<The undelete directory inode>")    /* 6 */
+       N_("<The undelete directory inode>"),   /* 6 */
+       N_("<The group descriptor inode>"),     /* 7 */
+       N_("<The journal inode>"),              /* 8 */
+       N_("<Reserved inode 9>"),               /* 9 */
+       N_("<Reserved inode 10>"),              /* 10 */
 };
 
 /*

diff --git a/e2fsck/mtrace.h b/e2fsck/mtrace.h
index b30ba7e98fb3bdcf481089591a080874d67ef4fe..2ed20eb0d8af23ce15ea3c4c7b93327255c33ea3 100644 (file)
--- a/e2fsck/mtrace.h
+++ b/e2fsck/mtrace.h
@@ -228,4 +228,4 @@ extern struct mstats mstats __P ((void));
 }
 #endif
 
-#endif /* malloc.h  */
+#endif /* mtrace.h  */

diff --git a/e2fsck/super.c b/e2fsck/super.c
index 1cc9f7b97dad6b2f85a0a5334310fbee84e67a75..352a6b43825af1ae4d3dcb0693cb790be43cc754 100644 (file)
--- a/e2fsck/super.c
+++ b/e2fsck/super.c
@@ -165,7 +165,7 @@ static int release_inode_block(ext2_filsys fs,
  * not deleted.
  */
 static int release_inode_blocks(e2fsck_t ctx, ext2_ino_t ino,
-                               struct ext2_inode *inode, char* block_buf,
+                               struct ext2_inode *inode, char *block_buf,
                                struct problem_context *pctx)
 {
        ext2_filsys                     fs = ctx->fs;