public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: Bob Peterson <rpeterso@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: cluster: RHEL55 - gfs2_edit: Fix indirect block scrolling Date: Mon, 17 Aug 2009 16:14:00 -0000 [thread overview] Message-ID: <20090817161405.AE43712022D@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ba69bf853258c94861b16a7120d005a5c167b003 Commit: ba69bf853258c94861b16a7120d005a5c167b003 Parent: 4a49bd324ec14ef70f61d8f344130377f252e63d Author: Bob Peterson <rpeterso@redhat.com> AuthorDate: Mon Jun 1 16:15:41 2009 -0500 Committer: Bob Peterson <rpeterso@redhat.com> CommitterDate: Mon Aug 17 10:46:19 2009 -0500 gfs2_edit: Fix indirect block scrolling This patch fixes a gfs2_edit segfault when srolling through indirect blocks rhbz#503485 --- gfs2/edit/gfs2hex.c | 2 +- gfs2/edit/hexedit.c | 38 +++++++++++++++++++------------------- gfs2/edit/hexedit.h | 1 + 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/gfs2/edit/gfs2hex.c b/gfs2/edit/gfs2hex.c index 7538b81..869ee00 100644 --- a/gfs2/edit/gfs2hex.c +++ b/gfs2/edit/gfs2hex.c @@ -369,7 +369,7 @@ void do_leaf_extended(char *buf, struct iinfo *indir) struct gfs2_dirent de; x = 0; - memset(indir, 0, sizeof(indir)); + memset(indir, 0, sizeof(*indir)); /* Directory Entries: */ for (i = sizeof(struct gfs2_leaf); i < sbd.bsize; i += de.de_rec_len) { diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index 66086c7..38274c2 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -1298,19 +1298,19 @@ void print_inode_type(__be16 de_type) /* ------------------------------------------------------------------------ */ int display_leaf(struct iinfo *ind) { - int start_line, total_dirents = 0; + int start_line, total_dirents = start_row[dmode]; int d; eol(0); if (gfs2_struct_type == GFS2_METATYPE_SB) print_gfs2("The superblock has 2 directories"); else - print_gfs2("This directory contains %d directory entries.", + print_gfs2("This directory block contains %d directory entries.", ind->ii[0].dirents); start_line = line; - for (d = 0; d < ind->ii[0].dirents; d++) { - if (termlines && d >= termlines - start_line - 1 + for (d = start_row[dmode]; d < ind->ii[0].dirents; d++) { + if (termlines && d >= termlines - start_line - 2 + start_row[dmode]) break; total_dirents++; @@ -1421,6 +1421,7 @@ int display_indirect(struct iinfo *ind, int indblocks, int level, uint64_t start eol(0); } start_line = line; + dsplines = termlines - line - 1; for (pndx = start_row[dmode]; (!termlines || pndx < termlines - start_line - 1 + start_row[dmode]) && pndx < indblocks; @@ -2330,16 +2331,14 @@ void hex_edit(int *exitch) void pageup(void) { if (dmode == EXTENDED_MODE) { - int dsplines = termlines - 6; - - if (edit_row[dmode] - (dsplines / lines_per_row[dmode]) > 0) { - start_row[dmode] -= (dsplines / lines_per_row[dmode]); + if (edit_row[dmode] - (dsplines / lines_per_row[dmode]) > 0) edit_row[dmode] -= (dsplines / lines_per_row[dmode]); - } - else { - start_row[dmode] = 0; + else edit_row[dmode] = 0; - } + if (start_row[dmode] - (dsplines / lines_per_row[dmode]) > 0) + start_row[dmode] -= (dsplines / lines_per_row[dmode]); + else + start_row[dmode] = 0; } else { start_row[dmode] = edit_row[dmode] = 0; @@ -2364,15 +2363,16 @@ void pageup(void) void pagedn(void) { if (dmode == EXTENDED_MODE) { - int dsplines = termlines - 6; - - if ((edit_row[dmode] + dsplines) / lines_per_row[dmode] + 1 < + if ((edit_row[dmode] + dsplines) / lines_per_row[dmode] + 1 <= end_row[dmode]) { start_row[dmode] += dsplines / lines_per_row[dmode]; edit_row[dmode] += dsplines / lines_per_row[dmode]; - } - else + } else { edit_row[dmode] = end_row[dmode] - 1; + while (edit_row[dmode] - start_row[dmode] + + 1 > last_entry_onscreen[dmode]) + start_row[dmode]++; + } } else { start_row[dmode] = edit_row[dmode] = 0; @@ -2727,7 +2727,8 @@ void interactive_mode(void) case '+': if (dmode == EXTENDED_MODE) { if (edit_row[dmode] + 1 < end_row[dmode]) { - if (edit_row[dmode] >= last_entry_onscreen[dmode]) + if (edit_row[dmode] - start_row[dmode] + + 1 > last_entry_onscreen[dmode]) start_row[dmode]++; edit_row[dmode]++; } @@ -2819,7 +2820,6 @@ void interactive_mode(void) /* --------------------------------------------------------- */ case 0x168: if (dmode == EXTENDED_MODE) { - int dsplines = termlines - 6; int ents_per_screen = dsplines / lines_per_row[dmode]; diff --git a/gfs2/edit/hexedit.h b/gfs2/edit/hexedit.h index e645807..95cdca9 100644 --- a/gfs2/edit/hexedit.h +++ b/gfs2/edit/hexedit.h @@ -105,6 +105,7 @@ EXTERN int editing INIT(0); EXTERN uint64_t temp_blk; EXTERN uint64_t starting_blk; EXTERN const char *block_type_str[15]; +EXTERN int dsplines; struct gfs_jindex { uint64_t ji_addr; /* starting block of the journal */
reply other threads:[~2009-08-17 16:14 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20090817161405.AE43712022D@lists.fedorahosted.org \ --to=rpeterso@fedoraproject.org \ --cc=cluster-cvs-relay@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).