gfs2-utils: master - gfs2_edit: has problems printing gfs1 journals

Bob Peterson rpeterso at fedoraproject.org
Thu Feb 3 17:09:46 UTC 2011


Gitweb:        http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=c81702e92ff710c3c12ccca13e8c30eff269427f
Commit:        c81702e92ff710c3c12ccca13e8c30eff269427f
Parent:        dde989e50401270fbfd8882c10e44e401afd78ec
Author:        Bob Peterson <rpeterso at redhat.com>
AuthorDate:    Thu Feb 3 08:13:35 2011 -0600
Committer:     Bob Peterson <rpeterso at redhat.com>
CommitterDate: Thu Feb 3 08:13:35 2011 -0600

gfs2_edit: has problems printing gfs1 journals

The gfs2_edit tool was releasing the buffer too soon while printing out
journals.  It worked for gfs2 journals, but not for gfs1 journals.  This
patch moves the buffer release later in the function so that gfs1 journals
will print correctly.

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

diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c
index 13d432f..aa49d50 100644
--- a/gfs2/edit/hexedit.c
+++ b/gfs2/edit/hexedit.c
@@ -2025,7 +2025,6 @@ static uint64_t find_journal_block(const char *journal, uint64_t *j_size)
 
 	if (!gfs1)
 		do_dinode_extended(&di, jindex_bh); /* parse dir. */
-	brelse(jindex_bh);
 
 	if (gfs1) {
 		struct gfs2_inode *jiinode;
@@ -2050,6 +2049,7 @@ static uint64_t find_journal_block(const char *journal, uint64_t *j_size)
 		*j_size = jdi.di_size;
 		brelse(j_bh);
 	}
+	brelse(jindex_bh);
 	return jblock;
 }
 


More information about the cluster-commits mailing list