From: Frederik Wessels <wessels147@gmail.com>
Date: Tue, 24 Apr 2012 11:59:56 +0000 (-0400)
Subject: Illumos #1946: incorrect formatting when listing output of multiple pools with zpool... 
X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=commitdiff_plain;h=95bcd51ecc3685111e03f407fa7ce40970f99aee;p=zfs.git

Illumos #1946: incorrect formatting when listing output of multiple pools with zpool iostat -v

Reviewed by: Richard Elling <richard.elling@richardelling.com>
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Approved by: Richard Lowe <richlowe@richlowe.net>

Reference to Illumos issue:
  https://www.illumos.org/issues/1946

Ported by: Richard Yao <ryao@cs.stonybrook.edu>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
---

diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
index a6c5a47..bc91771 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 <assert.h>
@@ -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);
 	}
 
 	/*