ChangeLog, ls.c:

  ls.c (list_super): Use better description of s_last_orphan
.del-ext2_fs.h~7a460879, ChangeLog:
  ext2_fs.h: Add comment explaining when journal fields are valid.

diff --git a/include/linux/ChangeLog b/include/linux/ChangeLog
index c4fd35881f4b0afd855d732616c0d30fc5645c19..3d0ccb944933720151549c620e8276f1c518d10d 100644 (file)
--- a/include/linux/ChangeLog
+++ b/include/linux/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-14    <tytso@valinux.com>
+
+       * ext2_fs.h: Add comment explaining when journal fields are valid.
+
 2000-07-13    <tytso@valinux.com>
 
        * Release of E2fsprogs 1.19

diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h
index 2f8fcfbcce3a4ec95732345a7357178df41bf99a..eca1a48accf4eaf0e74500a9276ecca76036f976 100644 (file)
--- a/include/linux/ext2_fs.h
+++ b/include/linux/ext2_fs.h
@@ -382,7 +382,7 @@ struct ext2_super_block {
        __u8    s_prealloc_dir_blocks;  /* Nr to preallocate for dirs */
        __u16   s_padding1;
        /* 
-        * Journaling support.
+        * Journaling support valid if EXT2_FEATURE_COMPAT_HAS_JOURNAL set.
         */
        __u8    s_journal_uuid[16];     /* uuid of journal superblock */
        __u32   s_journal_inum;         /* inode number of journal file */

diff --git a/lib/e2p/ChangeLog b/lib/e2p/ChangeLog
index 0b920b5532bfc1c32305d68b2741e6fe3ed4ce29..bf197bf33d07e7e3ccc51503165f654198c7dca1 100644 (file)
--- a/lib/e2p/ChangeLog
+++ b/lib/e2p/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-14    <tytso@valinux.com>
+
+       * ls.c (list_super): Use better description of s_last_orphan
+
 2000-07-13    <tytso@valinux.com>
 
        * Release of E2fsprogs 1.19

diff --git a/lib/e2p/ls.c b/lib/e2p/ls.c
index 2ab74b35d75cc408f02f095d9d6d23c259cf2dfa..4cef3a6c4efce6330d9d19fd5edccc993e71b839 100644 (file)
--- a/lib/e2p/ls.c
+++ b/lib/e2p/ls.c
@@ -295,8 +295,8 @@ void list_super (struct ext2_super_block * s)
                        e2p_uuid_to_str(sb->s_uuid, buf);
                printf("Journal UUID:             %s\n", buf);
                printf("Journal inode:            %u\n", s->s_journal_inum);
-               printf("Journal device:           %x\n", s->s_journal_dev);
-               printf("Orphaned inode list:      %u\n", s->s_last_orphan);
+               printf("Journal device:           %x\n", s->s_journal_dev);
+               printf("First orphan inode:       %u\n", s->s_last_orphan);
        }
 }