From 7c0e3941cdd4692d46c9171b791fa689f6bb1bfd Mon Sep 17 00:00:00 2001 From: Samuel <50765275+npc203@users.noreply.github.com> Date: Tue, 6 Sep 2022 22:07:47 +0530 Subject: [PATCH] Fix column width in 'zpool iostat -v' and 'zpool list -v' This commit fixes a minor spacing issue caused when enumerating vdev names, which originated from #13031 Reviewed-by: Brian Behlendorf Reviewed-by: Akash B Signed-off-by: Samuel Wycliffe Closes #13811 --- cmd/zpool/zpool_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c index 13a51691fa..b5b0beef53 100644 --- a/cmd/zpool/zpool_main.c +++ b/cmd/zpool/zpool_main.c @@ -5466,8 +5466,8 @@ get_namewidth_iostat(zpool_handle_t *zhp, void *data) * get_namewidth() returns the maximum width of any name in that column * for any pool/vdev/device line that will be output. */ - width = get_namewidth(zhp, cb->cb_namewidth, cb->cb_vdevs.cb_name_flags, - cb->cb_verbose); + width = get_namewidth(zhp, cb->cb_namewidth, + cb->cb_vdevs.cb_name_flags | VDEV_NAME_TYPE_ID, cb->cb_verbose); /* * The width we are calculating is the width of the header and also the @@ -6298,8 +6298,8 @@ get_namewidth_list(zpool_handle_t *zhp, void *data) list_cbdata_t *cb = data; int width; - width = get_namewidth(zhp, cb->cb_namewidth, cb->cb_name_flags, - cb->cb_verbose); + width = get_namewidth(zhp, cb->cb_namewidth, + cb->cb_name_flags | VDEV_NAME_TYPE_ID, cb->cb_verbose); if (width < 9) width = 9;