cluster: STABLE2 - gfs2_edit: Indirect pointers missing from list when paging up and down

Bob Peterson rpeterso@fedoraproject.org
Mon Aug 31 17:53:00 GMT 2009


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

gfs2_edit: Indirect pointers missing from list when paging up and down

When using page-up and page-down to scroll a list of indirect
block pointers, there was sometimes an occasional gap due to
incorrect end-of-line management.

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

diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c
index 07a3661..0d259bc 100644
--- a/gfs2/edit/hexedit.c
+++ b/gfs2/edit/hexedit.c
@@ -1285,8 +1285,6 @@ int display_indirect(struct iinfo *ind, int indblocks, int level, uint64_t start
 	int offsets[5];
 
 	last_entry_onscreen[dmode] = 0;
-	if (!level)
-		eol(0);
 	if (!has_indirect_blocks())
 		return -1;
 	if (!level) {
@@ -1302,7 +1300,6 @@ int display_indirect(struct iinfo *ind, int indblocks, int level, uint64_t start
 			print_gfs2("This indirect block contains %d indirect blocks",
 				   indblocks);
 	}
-	eol(0);
 	total_dirents = 0;
 	/* Figure out multiplication factors for indirect pointers. */
 	if (!S_ISDIR(di.di_mode)) {
@@ -1336,9 +1333,9 @@ int display_indirect(struct iinfo *ind, int indblocks, int level, uint64_t start
 				factor[i + 1] = factor[i] * inptrs;
 		}
 		if (!level)
-			print_gfs2("  (at height=%d)", cur_height);
-		eol(0);
+			print_gfs2("  (at height %d)", cur_height);
 	}
+	eol(0);
 	if (!level && indblocks) {
 		print_gfs2("Indirect blocks:");
 		eol(0);



More information about the Cluster-cvs mailing list