From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17365 invoked by alias); 31 Aug 2009 17:53:47 -0000 Received: (qmail 17359 invoked by alias); 31 Aug 2009 17:53:47 -0000 X-SWARE-Spam-Status: No, hits=-1.2 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_61,SPF_HELO_PASS X-Spam-Status: No, hits=-1.2 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_61,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: Indirect pointers missing from list when paging up and down 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: 0844bbd134790d48e39375e04ac360798f30d9d8 X-Git-Newrev: 04db3a388427a0b0b8f75dfe61b9e68170c3c746 From: Bob Peterson Message-Id: <20090831175321.BAB3D1201D4@lists.fedorahosted.org> Date: Mon, 31 Aug 2009 17:53: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/msg00270.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=04db3a388427a0b0b8f75dfe61b9e68170c3c746 Commit: 04db3a388427a0b0b8f75dfe61b9e68170c3c746 Parent: 0844bbd134790d48e39375e04ac360798f30d9d8 Author: Bob Peterson AuthorDate: Mon Aug 31 11:24:00 2009 -0500 Committer: Bob Peterson 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);