ChangeLog, debugfs.c:

  debugfs.c (dump_inode): Fix debugfs message so it is the same for when
  	compiled under either Linux 2.2 or 2.3.  This allows for the f_swapfs
  	regression test suite to work regardless of which OS e2fsprogs was
  	compiled on.

diff --git a/debugfs/ChangeLog b/debugfs/ChangeLog
index dfa1b04..87615b4 100644 (file)
--- a/debugfs/ChangeLog
+++ b/debugfs/ChangeLog
@@ -1,3 +1,10 @@
+1999-07-30    <tytso@rsts-11.mit.edu>
+
+       * debugfs.c (dump_inode): Fix debugfs message so it is the same
+               for when compiled under either Linux 2.2 or 2.3.  This
+               allows for the f_swapfs regression test suite to work
+               regardless of which OS e2fsprogs was compiled on.
+
 1999-07-18  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * Release of E2fsprogs 1.15

diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
index 87867ff..71c576d 100644 (file)
--- a/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@ -307,10 +307,10 @@ static void dump_inode(ino_t inode_num, struct ext2_inode inode)
        else i_type = "bad type";
        fprintf(out, "Inode: %ld   Type: %s    ", inode_num, i_type);
 #if defined(HAVE_EXT2_INODE_VERSION)
-       fprintf(out, "Mode:  %04o   Flags: 0x%x   Version: %d\n",
+       fprintf(out, "Mode:  %04o   Flags: 0x%x   Version/Generation: %d\n",
                inode.i_mode & 0777, inode.i_flags, inode.i_version);
 #else
-       fprintf(out, "Mode:  %04o   Flags: 0x%x   Generation: %d\n",
+       fprintf(out, "Mode:  %04o   Flags: 0x%x   Version/Generation: %d\n",
                inode.i_mode & 0777, inode.i_flags, inode.i_generation);
 #endif
        fprintf(out, "User: %5d   Group: %5d   Size: ",