commit 47b6e5b1dae92191b26b5ef84be4899985d786e3
Author: Bob Peterson <bob@ganesha.peterson>
Date:   Mon Aug 31 11:36:41 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

diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c
index 8cc4b1c..e1e2258 100644
--- a/gfs2/edit/hexedit.c
+++ b/gfs2/edit/hexedit.c
@@ -972,27 +972,16 @@ int parse_rindex(struct gfs2_inode *di, 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. */
-		di->i_di.di_size += ((di->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 offset = 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 offset;
 
-			gfs1_adj = (offset / sd_jbsize) *
-				sizeof(struct gfs2_meta_header);
-			gfs1_adj += sizeof(struct gfs2_meta_header);
-		}
+		offset = print_entry_ndx * risize();
 
-		error = gfs2_readi(di, (void *)&buf, offset + gfs1_adj,
-				   risize());
+		if (gfs1)
+			error = gfs1_readi(di, (void *)&buf, offset, risize());
+		else
+			error = gfs2_readi(di, (void *)&buf, offset, risize());
 		if (!error) /* end of file */
 			break;
 		gfs2_rindex_in(&ri, buf);