From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8782 invoked by alias); 31 Aug 2009 17:34:06 -0000 Received: (qmail 8776 invoked by alias); 31 Aug 2009 17:34:06 -0000 X-SWARE-Spam-Status: No, hits=-1.2 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_66,SPF_HELO_PASS X-Spam-Status: No, hits=-1.2 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_66,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: STABLE3 - gfs2_edit: Fix rindex read function for gfs1 file systems To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: a3dadcedb804eabfc014b31ba5258d46175828a0 X-Git-Newrev: e3d5be1efbc63c7c5809633be8411ae302974dab From: Bob Peterson Message-Id: <20090831173323.96EF31201FC@lists.fedorahosted.org> Date: Mon, 31 Aug 2009 17:34:00 -0000 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 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/msg00264.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=e3d5be1efbc63c7c5809633be8411ae302974dab Commit: e3d5be1efbc63c7c5809633be8411ae302974dab Parent: a3dadcedb804eabfc014b31ba5258d46175828a0 Author: Bob Peterson AuthorDate: Mon Aug 31 11:47:42 2009 -0500 Committer: Bob Peterson CommitterDate: Mon Aug 31 11:47:42 2009 -0500 gfs2_edit: Fix rindex read function for gfs1 file systems The gfs2_edit program was written before libgfs2 had support for GFS1 data structures, therefore, the reading of rindex was horribly kludged. This switches to the new standard way of reading rindex for GFS1. rhbz#503529 --- gfs2/edit/hexedit.c | 25 +++++++------------------ 1 files changed, 7 insertions(+), 18 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index 35fce6e..5a01b1f 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -961,27 +961,16 @@ static int parse_rindex(struct gfs2_inode *dip, int print_rindex) eol(0); lines_per_row[dmode] = 6; memset(highlighted_addr, 0, sizeof(highlighted_addr)); - if (gfs1) { - /* gfs1 rindex files have the meta_header which is not - accounted for in gfs2's dinode size. Therefore, adjust. */ - dip->i_di.di_size += ((dip->i_di.di_size / sbd.bsize) + 1) * - sizeof(struct gfs2_meta_header); - } - for (print_entry_ndx=0; ; print_entry_ndx++) { - uint64_t gfs1_adj = 0; - uint64_t roffset = print_entry_ndx * risize(); - if (gfs1) { - uint64_t sd_jbsize = - (sbd.bsize - sizeof(struct gfs2_meta_header)); + for (print_entry_ndx=0; ; print_entry_ndx++) { + uint64_t roff; - gfs1_adj = (roffset / sd_jbsize) * - sizeof(struct gfs2_meta_header); - gfs1_adj += sizeof(struct gfs2_meta_header); - } + roff = print_entry_ndx * risize(); - error = gfs2_readi(dip, (void *)&rbuf, roffset + gfs1_adj, - risize()); + if (gfs1) + error = gfs1_readi(dip, (void *)&rbuf, roff, risize()); + else + error = gfs2_readi(dip, (void *)&rbuf, roff, risize()); if (!error) /* end of file */ break; gfs2_rindex_in(&ri, rbuf);