From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17548 invoked by alias); 31 Aug 2009 17:53:51 -0000 Received: (qmail 17484 invoked by alias); 31 Aug 2009 17:53:50 -0000 X-SWARE-Spam-Status: No, hits=-1.2 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_22,SPF_HELO_PASS X-Spam-Status: No, hits=-1.2 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_22,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: STABLE2 - gfs2_edit: Add missing superblock fields for gfs1 file systems To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE2 X-Git-Reftype: branch X-Git-Oldrev: 04db3a388427a0b0b8f75dfe61b9e68170c3c746 X-Git-Newrev: 17f2b5baf3b61c69ed2328fad89bd8cbc9bbebde From: Bob Peterson Message-Id: <20090831175323.D4BAA1201FC@lists.fedorahosted.org> Date: Mon, 31 Aug 2009 17:53:00 -0000 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q3/txt/msg00273.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=17f2b5baf3b61c69ed2328fad89bd8cbc9bbebde Commit: 17f2b5baf3b61c69ed2328fad89bd8cbc9bbebde Parent: 04db3a388427a0b0b8f75dfe61b9e68170c3c746 Author: Bob Peterson AuthorDate: Mon Aug 31 11:32:57 2009 -0500 Committer: Bob Peterson 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);