From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 17 Mar 2003 18:53:38 +0000 (-0500)
Subject: ls.c (list_super2): Display the superblock fields even if the
X-Git-Tag: E2FSPROGS-1_33-WIP-0325~8
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=9522e0aa0408a541423992f747ce49219fea97ff;p=tools%2Fe2fsprogs.git

ls.c (list_super2): Display the superblock fields even if the
	journal or the dir index feature is not enabled.
---

diff --git a/lib/e2p/ChangeLog b/lib/e2p/ChangeLog
index d8e441c..8947d9c 100644
--- a/lib/e2p/ChangeLog
+++ b/lib/e2p/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-17  Theodore Ts'o  <tytso@mit.edu>
+
+	* ls.c (list_super2): Display the superblock fields even if the
+		journal or the dir index feature is not enabled.
+
 2002-11-09  Theodore Ts'o  <tytso@mit.edu>
 
 	* Release of E2fsprogs 1.32
diff --git a/lib/e2p/ls.c b/lib/e2p/ls.c
index 9e2b1b5..d5a112c 100644
--- a/lib/e2p/ls.c
+++ b/lib/e2p/ls.c
@@ -240,19 +240,25 @@ void list_super2(struct ext2_super_block * sb, FILE *f)
 		fprintf(f, "First inode:              %d\n", sb->s_first_ino);
 		fprintf(f, "Inode size:		  %d\n", sb->s_inode_size);
 	}
-	if (sb->s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL) {
+	if (!e2p_is_null_uuid(sb->s_journal_uuid))
 		fprintf(f, "Journal UUID:             %s\n",
 			e2p_uuid2str(sb->s_journal_uuid));
-		fprintf(f, "Journal inode:            %u\n", sb->s_journal_inum);
-		fprintf(f, "Journal device:	          0x%04x\n", sb->s_journal_dev);
-		fprintf(f, "First orphan inode:       %u\n", sb->s_last_orphan);
-	}
-	if (sb->s_feature_compat & EXT2_FEATURE_COMPAT_DIR_INDEX) {
+	if (sb->s_journal_inum)
+		fprintf(f, "Journal inode:            %u\n",
+			sb->s_journal_inum);
+	if (sb->s_journal_dev)
+		fprintf(f, "Journal device:	          0x%04x\n",
+			sb->s_journal_dev);
+	if (sb->s_last_orphan)
+		fprintf(f, "First orphan inode:       %u\n",
+			sb->s_last_orphan);
+	if ((sb->s_feature_compat & EXT2_FEATURE_COMPAT_DIR_INDEX) ||
+	    sb->s_def_hash_version)
 		fprintf(f, "Default directory hash:   %s\n",
 			e2p_hash2string(sb->s_def_hash_version));
+	if (!e2p_is_null_uuid(sb->s_hash_seed))
 		fprintf(f, "Directory Hash Seed:      %s\n",
 			e2p_uuid2str(sb->s_hash_seed));
-	}
 }
 
 void list_super (struct ext2_super_block * s)