cluster: STABLE2 - gfs2_edit: Add missing superblock fields for gfs1 file systems

[Bob Peterson <rpeterso@fedoraproject.org>]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=17f2b5baf3b61c69ed2328fad89bd8cbc9bbebde
Commit:        17f2b5baf3b61c69ed2328fad89bd8cbc9bbebde
Parent:        04db3a388427a0b0b8f75dfe61b9e68170c3c746
Author:        Bob Peterson <bob@ganesha.peterson>
AuthorDate:    Mon Aug 31 11:32:57 2009 -0500
Committer:     Bob Peterson <rpeterso@redhat.com>
CommitterDate: Mon Aug 31 12:54:54 2009 -0500

gfs2_edit: Add missing superblock fields for gfs1 file systems

This patch adds GFS1 fields sb_flags and sb_seg_size when
printing structures for GFS1 file system superblocks.

rhbz#503529
---
 gfs2/edit/gfs2hex.c |    4 +++-
 gfs2/edit/hexedit.c |    2 ++
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/gfs2/edit/gfs2hex.c b/gfs2/edit/gfs2hex.c
index 0d74720..010fda5 100644
--- a/gfs2/edit/gfs2hex.c
+++ b/gfs2/edit/gfs2hex.c
@@ -458,10 +458,12 @@ void gfs2_sb_print2(struct gfs2_sb *sb)
 
 	pv(sb, sb_fs_format, "%u", "0x%x");
 	pv(sb, sb_multihost_format, "%u", "0x%x");
-
+	if (gfs1)
+		pv(sbd1, sb_flags, "%u", "0x%x");
 	pv(sb, sb_bsize, "%u", "0x%x");
 	pv(sb, sb_bsize_shift, "%u", "0x%x");
 	if (gfs1) {
+		pv(sbd1, sb_seg_size, "%u", "0x%x");
 		gfs2_inum_print2("jindex ino", &sbd1->sb_jindex_di);
 		gfs2_inum_print2("rindex ino", &sbd1->sb_rindex_di);
 	}
diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c
index 0d259bc..d547d85 100644
--- a/gfs2/edit/hexedit.c
+++ b/gfs2/edit/hexedit.c
@@ -1666,6 +1666,8 @@ void read_superblock(int fd)
 		struct gfs_sb *sbbuf = (struct gfs_sb *)buf;
 
 		gfs1 = TRUE;
+		sbd1->sb_flags = be32_to_cpu(sbbuf->sb_flags);
+		sbd1->sb_seg_size = be32_to_cpu(sbbuf->sb_seg_size);
 		gfs2_inum_in(&sbd1->sb_rindex_di, (void *)&sbbuf->sb_rindex_di);
 		gfs2_inum_in(&gfs1_quota_di, (void *)&sbbuf->sb_quota_di);
 		gfs2_inum_in(&gfs1_license_di, (void *)&sbbuf->sb_license_di);