From 95bcd51ecc3685111e03f407fa7ce40970f99aee Mon Sep 17 00:00:00 2001 From: Frederik Wessels Date: Tue, 24 Apr 2012 07:59:56 -0400 Subject: [PATCH] Illumos #1946: incorrect formatting when listing output of multiple pools with zpool iostat -v Reviewed by: Richard Elling Reviewed by: Joshua M. Clulow Approved by: Richard Lowe Reference to Illumos issue: https://www.illumos.org/issues/1946 Ported by: Richard Yao Signed-off-by: Brian Behlendorf --- cmd/zpool/zpool_main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c index a6c5a47231..bc91771376 100644 --- a/cmd/zpool/zpool_main.c +++ b/cmd/zpool/zpool_main.c @@ -21,6 +21,9 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright 2011 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2011 by Delphix. All rights reserved. + * Copyright (c) 2012 by Frederik Wessels. All rights reserved. */ #include @@ -2236,7 +2239,8 @@ get_namewidth(zpool_handle_t *zhp, void *data) if (!cb->cb_verbose) cb->cb_namewidth = strlen(zpool_get_name(zhp)); else - cb->cb_namewidth = max_width(zhp, nvroot, 0, 0); + cb->cb_namewidth = max_width(zhp, nvroot, 0, + cb->cb_namewidth); } /*