Skip to contentSkip to conversation

gfs2_edit: Add more intelligence to journal dumps

PATCH New Bob Peterson 1 participant 1 message Feb 27, 2014 1 message not in the archive

lore
Share & tools
lore
#1 lore raw

PATCH 1/1 gfs2_edit: Add more intelligence to journal dumps

In reply to a message not in the archive

Hi,

This patch adds the ability for a gfs2_edit journal dump to look for journal entries pertaining to a particular block. The syntax is:
gfs2_edit -p journal0 0x12345 /dev/my_vg/my_lv

Regards,

Bob Peterson
Red Hat File Systems

---

gfs2/edit/hexedit.c +104 -46
index e191a27..fb30a03 100644
@@ -45,8 +45,6 @@ int details = 0;
 long int gziplevel = 9;
 static int termcols;
 
-int display(int identify_only);
-
 /* for assigning numeric fields: */
 #define checkassign(strfield, struct, member, value) do {		\
 		if (strcmp(#member, strfield) == 0) {			\
@@ -578,14 +576,73 @@ static void print_usage(void)
 /* returns: metatype if block is a GFS2 structure block type                */
 /*          0 if block is not a GFS2 structure                              */
 /* ------------------------------------------------------------------------ */
-uint32_t get_block_type(const struct gfs2_buffer_head *lbh)
+uint32_t get_block_type(const struct gfs2_buffer_head *lbh, int *structlen)
 {
 	const struct gfs2_meta_header *mh = lbh->iov.iov_base;
+	uint32_t ty;
 
-	if (be32_to_cpu(mh->mh_magic) == GFS2_MAGIC)
-		return be32_to_cpu(mh->mh_type);
+	if (!be32_to_cpu(mh->mh_magic) == GFS2_MAGIC)
+		return 0;
 
-	return 0;
+	ty = be32_to_cpu(mh->mh_type);
+	if (structlen == NULL)
+		return ty;
+	switch (ty) {
+	case GFS2_METATYPE_SB:   /* 1 */
+		if (sbd.gfs1)
+			*structlen = sizeof(struct gfs_sb);
+		else
+			*structlen = sizeof(struct gfs2_sb);
+		break;
+	case GFS2_METATYPE_RG:   /* 2 */
+		*structlen = sizeof(struct gfs2_rgrp);
+		break;
+	case GFS2_METATYPE_RB:   /* 3 */
+		*structlen = sizeof(struct gfs2_meta_header);
+		break;
+	case GFS2_METATYPE_DI:   /* 4 */
+		*structlen = sizeof(struct gfs2_dinode);
+		break;
+	case GFS2_METATYPE_IN:   /* 5 */
+		if (sbd.gfs1)
+			*structlen = sizeof(struct gfs_indirect);
+		else
+			*structlen = sizeof(struct gfs2_meta_header);
+		break;
+	case GFS2_METATYPE_LF:   /* 6 */
+		*structlen = sizeof(struct gfs2_leaf);
+		break;
+	case GFS2_METATYPE_JD:
+		*structlen = sizeof(struct gfs2_meta_header);
+		break;
+	case GFS2_METATYPE_LH:
+		*structlen = sizeof(struct gfs2_log_header);
+		break;
+	case GFS2_METATYPE_LD:
+		if (sbd.gfs1)
+			*structlen = sizeof(struct gfs_log_descriptor);
+		else
+			*structlen = sizeof(struct gfs2_log_descriptor);
+		break;
+	case GFS2_METATYPE_EA:
+		*structlen = sizeof(struct gfs2_meta_header) +
+			sizeof(struct gfs2_ea_header);
+		break;
+	case GFS2_METATYPE_ED:
+		*structlen = sizeof(struct gfs2_meta_header) +
+			sizeof(struct gfs2_ea_header);
+		break;
+	case GFS2_METATYPE_LB:
+		*structlen = sizeof(struct gfs2_meta_header);
+		break;
+	case GFS2_METATYPE_QC:
+		*structlen = sizeof(struct gfs2_quota_change);
+		break;
+	default:
+		*structlen = sbd.bsize;
+		break;
+	}
+	return ty;
 }
 
 /* ------------------------------------------------------------------------ */
@@ -624,78 +681,52 @@ int display_block_type(int from_restore)
 		struct_len = sbd.gfs1 ? sizeof(struct gfs_rgrp) :
 			sizeof(struct gfs2_rgrp);
 	} else {
-		ret_type = get_block_type(bh);
+		ret_type = get_block_type(bh, &struct_len);
 		switch (ret_type) {
 		case GFS2_METATYPE_SB:   /* 1 */
 			print_gfs2("(superblock)");
-			if (sbd.gfs1)
-				struct_len = sizeof(struct gfs_sb);
-			else
-				struct_len = sizeof(struct gfs2_sb);
 			break;
 		case GFS2_METATYPE_RG:   /* 2 */
 			print_gfs2("(rsrc grp hdr)");
-			struct_len = sizeof(struct gfs2_rgrp);
 			break;
 		case GFS2_METATYPE_RB:   /* 3 */
 			print_gfs2("(rsrc grp bitblk)");
-			struct_len = sizeof(struct gfs2_meta_header);
 			break;
 		case GFS2_METATYPE_DI:   /* 4 */
 			print_gfs2("(disk inode)");
-			struct_len = sizeof(struct gfs2_dinode);
 			break;
 		case GFS2_METATYPE_IN:   /* 5 */
 			print_gfs2("(indir blklist)");
-			if (sbd.gfs1)
-				struct_len = sizeof(struct gfs_indirect);
-			else
-				struct_len = sizeof(struct gfs2_meta_header);
 			break;
 		case GFS2_METATYPE_LF:   /* 6 */
 			print_gfs2("(directory leaf)");
-			struct_len = sizeof(struct gfs2_leaf);
 			break;
 		case GFS2_METATYPE_JD:
 			print_gfs2("(journal data)");
-			struct_len = sizeof(struct gfs2_meta_header);
 			break;
 		case GFS2_METATYPE_LH:
 			print_gfs2("(log header)");
-			struct_len = sizeof(struct gfs2_log_header);
 			break;
 		case GFS2_METATYPE_LD:
 		 	print_gfs2("(log descriptor)");
-			if (sbd.gfs1)
-				struct_len = sizeof(struct gfs_log_descriptor);
-			else
-				struct_len =
-					sizeof(struct gfs2_log_descriptor);
 			break;
 		case GFS2_METATYPE_EA:
 			print_gfs2("(extended attr hdr)");
-			struct_len = sizeof(struct gfs2_meta_header) +
-				sizeof(struct gfs2_ea_header);
 			break;
 		case GFS2_METATYPE_ED:
 			print_gfs2("(extended attr data)");
-			struct_len = sizeof(struct gfs2_meta_header) +
-				sizeof(struct gfs2_ea_header);
 			break;
 		case GFS2_METATYPE_LB:
 			print_gfs2("(log buffer)");
-			struct_len = sizeof(struct gfs2_meta_header);
 			break;
 		case GFS2_METATYPE_QC:
 			print_gfs2("(quota change)");
-			struct_len = sizeof(struct gfs2_quota_change);
 			break;
 		case 0:
 			struct_len = sbd.bsize;
 			break;
 		default:
 			print_gfs2("(wtf?)");
-			struct_len = sbd.bsize;
 			break;
 		}
 	}
@@ -848,18 +879,26 @@ static const struct lgfs2_metadata *find_mtype(uint32_t mtype, const unsigned ve
 /* ------------------------------------------------------------------------ */
 /* hexdump - hex dump the filesystem block to the screen                    */
 /* ------------------------------------------------------------------------ */
-static int hexdump(uint64_t startaddr, int len)
+static int hexdump(uint64_t startaddr, int len, int trunc_zeros,
+		   uint64_t flagref)
 {
-	const unsigned char *pointer,*ptr2;
+	const unsigned char *pointer, *ptr2;
 	int i;
 	uint64_t l;
 	const char *lpBuffer = bh->b_data;
+	const char *zeros_strt = lpBuffer + sbd.bsize;
 	int print_field, cursor_line;
-	const uint32_t block_type = get_block_type(bh);
+	const uint32_t block_type = get_block_type(bh, NULL);
+	uint64_t *ref;
 
 	strcpy(edit_fmt,"%02x");
 	pointer = (unsigned char *)lpBuffer + offset;
 	ptr2 = (unsigned char *)lpBuffer + offset;
+	ref = (uint64_t *)lpBuffer + offset;
+	if (trunc_zeros) {
+		while (zeros_strt > lpBuffer && (*(zeros_strt - 1) == 0))
+			zeros_strt--;
+	}
 	l = offset;
 	print_entry_ndx = 0;
 	while (((termlines && line < termlines &&
@@ -990,9 +1029,20 @@ static int hexdump(uint64_t startaddr, int len)
 		}
 		if (line - 3 > last_entry_onscreen[dmode])
 			last_entry_onscreen[dmode] = line - 3;
+		if (flagref && be64_to_cpu(*ref) == flagref)
+			print_gfs2("<------------------------- ref to 0x%llx",
+				   flagref);
+		ref++;
+		if (flagref && be64_to_cpu(*ref) == flagref)
+			print_gfs2("<------------------------- ref to 0x%llx",
+				   flagref);
+		ref++;
 		eol(0);
-		l+=16;
+		l += 16;
 		print_entry_ndx++;
+		/* This should only happen if trunc_zeros is specified: */
+		if ((const char *)pointer >= zeros_strt)
+			break;
 	} /* while */
 	if (sbd.gfs1) {
 		COLORS_NORMAL;
@@ -1343,7 +1393,7 @@ static void read_master_dir(void)
 /* ------------------------------------------------------------------------ */
 /* display                                                                  */
 /* ------------------------------------------------------------------------ */
-int display(int identify_only)
+int display(int identify_only, int trunc_zeros, uint64_t flagref)
 {
 	uint64_t blk;
 
@@ -1432,7 +1482,8 @@ int display(int identify_only)
 	}
 	if (dmode == HEX_MODE)          /* if hex display mode           */
 		hexdump(dev_offset, (gfs2_struct_type == GFS2_METATYPE_DI)?
-			struct_len + di.di_size:sbd.bsize);
+			struct_len + di.di_size:sbd.bsize, trunc_zeros,
+			flagref);
 	else if (dmode == GFS2_MODE)    /* if structure display          */
 		display_gfs2();            /* display the gfs2 structure    */
 	else
@@ -1952,7 +2003,7 @@ static void find_print_block_type(void)
 
 	tblock = blockstack[blockhist % BLOCK_STACK_SIZE].block;
 	lbh = bread(&sbd, tblock);
-	type = get_block_type(lbh);
+	type = get_block_type(lbh, NULL);
 	print_block_type(tblock, type, "");
 	brelse(lbh);
 	gfs2_rgrp_free(&sbd.rgtree);
@@ -2086,7 +2137,7 @@ static void process_field(const char *field, const char *nstr)
 		setstring = 1;
 	fblock = blockstack[blockhist % BLOCK_STACK_SIZE].block;
 	rbh = bread(&sbd, fblock);
-	type = get_block_type(rbh);
+	type = get_block_type(rbh, NULL);
 	switch (type) {
 	case GFS2_METATYPE_SB:
 		gfs2_sb_in(&lsb, rbh);
@@ -2233,7 +2284,7 @@ static void interactive_mode(void)
 	Quit = FALSE;
 	editing = FALSE;
 	while (!Quit) {
-		display(FALSE);
+		display(FALSE, 0, 0);
 		if (editing) {
 			if (edit_row[dmode] == -1)
 				block = goto_block();
@@ -2701,9 +2752,16 @@ static void process_parameters(int argc, char *argv[], int pass)
 		if (termlines || strchr(argv[i],'/')) /* if print or slash */
 			continue;
 			
-		if (!strncmp(argv[i], "journal", 7) &&
-		    isdigit(argv[i][7])) {
-			dump_journal(argv[i]);
+		if (!strncmp(argv[i], "journal", 7) && isdigit(argv[i][7])) {
+			int blk = 0;
+
+			if (i < argc - 1 && isdigit(argv[i + 1][0])) {
+				if (argv[i + 1][0]=='0' && argv[i + 1][1]=='x')
+					sscanf(argv[i + 1], "%x", &blk);
+				else
+					blk = atoi(argv[i + 1]);
+			}
+			dump_journal(argv[i], blk);
 			continue;
 		}
 		keyword_blk = check_keywords(argv[i]);
@@ -2907,7 +2965,7 @@ int main(int argc, char *argv[])
 			block = blockstack[i + 1].block;
 			if (!block)
 				break;
-			display(identify);
+			display(identify, 0, 0);
 			if (!identify) {
 				display_extended();
 				printf("-------------------------------------" \
gfs2/edit/hexedit.h +4 -2
index 8117f15..fc0f2cb 100644
@@ -67,6 +67,7 @@ extern int dsplines;
 extern int dsp_lines[DMODES];
 extern int combined_display;
 extern int details;
+extern const char *allocdesc[2][5];
 
 struct gfs2_dirents {
 	uint64_t block;
@@ -224,11 +225,12 @@ extern void gfs_dinode_in(struct gfs_dinode *di, struct gfs2_buffer_head *bh);
 extern void savemeta(char *out_fn, int saveoption, int gziplevel);
 extern void restoremeta(const char *in_fn, const char *out_device,
 			uint64_t printblocksonly);
-extern int display(int identify_only);
+extern int display(int identify_only, int trunc_zeros, uint64_t flagref);
 extern uint64_t check_keywords(const char *kword);
 extern uint64_t masterblock(const char *fn);
 extern void gfs_rgrp_print(struct gfs_rgrp *rg);
 extern int has_indirect_blocks(void);
-extern uint32_t get_block_type(const struct gfs2_buffer_head *lbh);
+extern uint32_t get_block_type(const struct gfs2_buffer_head *lbh,
+			       int *structlen);
 
 #endif /* __HEXVIEW_DOT_H__ */
gfs2/edit/journal.c +332 -88

515 lines not on this page · raw message

gfs2/edit/journal.h +1 -2
index e227a77..1e5968b 100644
@@ -1,8 +1,7 @@
 #ifndef __JOURNAL_DOT_H__
 #define __JOURNAL_DOT_H__
 
-extern void dump_journal(const char *journal);
+extern void dump_journal(const char *journal, int tblk);
 extern uint64_t find_journal_block(const char *journal, uint64_t *j_size);
 
-
 #endif
gfs2/edit/savemeta.c +1 -1
index b4c85d6..b80ce10 100644
@@ -929,7 +929,7 @@ static int restore_data(int fd, gzFile gzin_fd, int printblocksonly,
 			block = savedata->blk;
 			if (printblocksonly > 1 && printblocksonly == block) {
 				block_in_mem = block;
-				display(0);
+				display(0, 0, 0);
 				return 0;
 			} else if (printblocksonly == 1) {
 				print_gfs2("%d (l=0x%x): ", blks_saved,