From 6bec4351f5877f3f20dc9d7730aba7b1df983ecd Mon Sep 17 00:00:00 2001 From: Tim Chase Date: Wed, 29 Jul 2015 23:11:32 -0500 Subject: [PATCH] ztest: display non-index properties properly at verbose level 6 At verbosity levels of 6 or greater, ztest_dsl_prop_set_uint64() attempts to display the value of all properties as indexed values regardless of whether the property is an indexed value or simply an un-indexed integer. This patch causes the numeric value of the property to be displayed if zfs_prop_index_to_string() fails. Signed-off-by: Tim Chase Signed-off-by: Brian Behlendorf Closes #3649 --- cmd/ztest/ztest.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c index 642cab5f2f33..f2ffcaf3e634 100644 --- a/cmd/ztest/ztest.c +++ b/cmd/ztest/ztest.c @@ -1097,9 +1097,16 @@ ztest_dsl_prop_set_uint64(char *osname, zfs_prop_t prop, uint64_t value, VERIFY0(dsl_prop_get_integer(osname, propname, &curval, setpoint)); if (ztest_opts.zo_verbose >= 6) { - VERIFY(zfs_prop_index_to_string(prop, curval, &valname) == 0); - (void) printf("%s %s = %s at '%s'\n", - osname, propname, valname, setpoint); + int err; + + err = zfs_prop_index_to_string(prop, curval, &valname); + if (err) + (void) printf("%s %s = %llu at '%s'\n", + osname, propname, (unsigned long long)curval, + setpoint); + else + (void) printf("%s %s = %s at '%s'\n", + osname, propname, valname, setpoint); } umem_free(setpoint, MAXPATHLEN);