Attachment 907327 Details for Bug 1107238 – Proposed RHEL7 patch

[patch] Proposed RHEL7 patch

bz1107238.try1.patch (text/plain), 1.24 KB, created by Robert Peterson on 2014-06-10 16:38:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Peterson

Created: 2014-06-10 16:38:05 UTC

Size: 1.24 KB

patch

obsolete

>commit 0e77e08f8139a4620b61a5ae1483544380fb1729
>Author: Bob Peterson <rpeterso@redhat.com>
>Date:   Tue Jun 10 11:32:29 2014 -0500
>
>    gfs2_edit: print LB (log descriptor continuation blocks) for GFS2
>    
>    This patch allows gfs2_edit to print metadata blocks of type LB
>    (log descriptor continuation blocks) for GFS2. Prior to this, only
>    GFS1's continuation blocks would print.
>
>diff --git a/gfs2/edit/journal.c b/gfs2/edit/journal.c
>index a086f79..24aaf9b 100644
>--- a/gfs2/edit/journal.c
>+++ b/gfs2/edit/journal.c
>@@ -590,12 +590,15 @@ void dump_journal(const char *journal, int tblk)
> 					since_umount = 0;
> 			}
> 			eol(0);
>-		} else if (sbd.gfs1 && ld_blocks > 0) {
>-			print_gfs2("0x%llx (j+%4llx): GFS log descriptor"
>+		} else if ((ld_blocks > 0) &&
>+			   (sbd.gfs1 || block_type == GFS2_METATYPE_LB)) {
>+			print_gfs2("0x%llx (j+%4llx): Log Descriptor"
> 				   " continuation block", abs_block, jb);
> 			eol(0);
> 			print_gfs2("                    ");
>-			ld_blocks -= print_ld_blks((uint64_t *)dummy_bh.b_data,
>+			ld_blocks -= print_ld_blks((uint64_t *)dummy_bh.b_data +
>+						   (sbd.gfs1 ? 0 :
>+						    sizeof(struct gfs2_meta_header)),
> 						   (dummy_bh.b_data +
> 						    sbd.bsize), start_line,
> 						   tblk, &tblk_off, 0, rgd,

Actions: View | Diff

Attachments on bug 1107238: 907327