From: Eugene Syromyatnikov <evgsyr@gmail.com>
Date: Wed, 4 Apr 2018 13:56:52 +0000 (+0200)
Subject: btrfs: use printxval_u for error types printing
X-Git-Tag: v4.23~287
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3dd9d5f34a6d78fd185edc28513f84133ff08db3;p=strace

btrfs: use printxval_u for error types printing

* btrfs.c (MPERS_PRINTER_DECL(btrfs_ioctl)) <case
BTRFS_IOC_GET_DEV_STATS>: Use printxval_u for error type printing.
* tests/btrfs.c (btrfs_test_get_dev_stats_ioctl): Update expected output.
---

diff --git a/btrfs.c b/btrfs.c
index 5e1a04b9..bae18478 100644
--- a/btrfs.c
+++ b/btrfs.c
@@ -813,13 +813,9 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl,
 				break;
 			}
 
-			const char *err_type =
-				xlookup(btrfs_dev_stats_values, i);
-			if (err_type)
-				tprintf("[%s] = ", err_type);
-			else
-				tprintf("[%" PRIu64 "] = ", i);
-			tprintf("%" PRI__u64, args.values[i]);
+			tprints("[");
+			printxval_u(btrfs_dev_stats_values, i, NULL);
+			tprintf("] = %" PRI__u64, args.values[i]);
 		}
 		tprints("]}");
 		break;
diff --git a/tests/btrfs.c b/tests/btrfs.c
index 20bf6c0b..b44bc872 100644
--- a/tests/btrfs.c
+++ b/tests/btrfs.c
@@ -1724,10 +1724,14 @@ btrfs_test_get_dev_stats_ioctl(void)
 			if (i)
 				printf(", ");
 
-			if (name)
-				printf("[%s] = ", name);
-			else
+			if (name) {
+				if (verbose_xlat)
+					printf("[%u /* %s */] = ", i, name);
+				else
+					printf("[%s] = ", name);
+			} else {
 				printf("[%u] = ", i);
+			}
 
 			printf("%" PRI__u64, args.values[i]);
 		}