blkparse: add custom format field specifiers for remapping event

index 14737f81c78d..45ffe04d71c1 100644
@@ -175,7 +175,8 @@ static void get_pdu_remap(struct blk_io_trace *t, struct blk_io_trace_remap *r)
 static void print_field(char *act, struct per_cpu_info *pci,
 			struct blk_io_trace *t, unsigned long long elapsed,
 			int pdu_len, unsigned char *pdu_buf, char field,
-			int minus, int has_w, int width)
+			int minus, int has_w, int width,
+			struct blk_io_trace_remap *r)
 {
 	char format[64];
 

@@ -216,6 +217,16 @@ static void print_field(char *act, struct per_cpu_info *pci,
 	case 'g':
 		fprintf(ofp, strcat(format, "*s"), pdu_len, pdu_buf);
 		break;
+	case 'i':
+		fprintf(ofp, strcat(format, "d"), MAJOR(r->device_from));
+		break;
+	case 'j':
+		fprintf(ofp, strcat(format, "d"), MINOR(r->device_from));
+		break;
+	case 'k':
+		fprintf(ofp, strcat(format, "llu"),
+			(unsigned long long)r->sector_from);
+		break;
 	case 'M':
 		fprintf(ofp, strcat(format, "d"), MAJOR(t->device));
 		break;

@@ -275,7 +286,7 @@ static void print_field(char *act, struct per_cpu_info *pci,
 static char *parse_field(char *act, struct per_cpu_info *pci,
 			 struct blk_io_trace *t, unsigned long long elapsed,
 			 int pdu_len, unsigned char *pdu_buf,
-			 char *master_format)
+			 char *master_format, struct blk_io_trace_remap *r)
 {
 	int minus = 0;
 	int has_w = 0;

@@ -294,7 +305,7 @@ static char *parse_field(char *act, struct per_cpu_info *pci,
 	}
 	if (*p) {
 		print_field(act, pci, t, elapsed, pdu_len, pdu_buf, *p++,
-			    minus, has_w, width);
+			    minus, has_w, width, r);
 	}
 	return p;
 }

@@ -438,6 +449,7 @@ void process_fmt(char *act, struct per_cpu_info *pci, struct blk_io_trace *t,
 		 unsigned long long elapsed, int pdu_len,
 		 unsigned char *pdu_buf)
 {
+	struct blk_io_trace_remap r = { .device_from = 0, };
 	char *p = override_format[(int) *act];
 
 	if (!p) {

@@ -445,6 +457,14 @@ void process_fmt(char *act, struct per_cpu_info *pci, struct blk_io_trace *t,
 		return;
 	}
 
+	/*
+	 * For remaps we have to modify the device using the remap structure
+	 * passed up.
+	 */
+	if (act[0] = 'A') {
+		get_pdu_remap(t, &r);
+		t->device = r.device_to;
+	}
 	while (*p) {
 		switch (*p) {
 		case '%': 	/* Field specifier */

@@ -455,7 +475,7 @@ void process_fmt(char *act, struct per_cpu_info *pci, struct blk_io_trace *t,
 				fprintf(ofp, "%c", '%');
 			else
 				p = parse_field(act, pci, t, elapsed,
-						pdu_len, pdu_buf, p);
+						pdu_len, pdu_buf, p, &r);
 			break;
 		case '\\': {	/* escape */
 			switch (p[1]) {