diff options
| author | mm <mm@FreeBSD.org> | 2012-05-27 12:22:15 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2012-05-27 12:22:15 +0000 |
| commit | a0cba7035e79b9072daec4c39acf9bcb521b9f0e (patch) | |
| tree | a7376d3ce23e81b3549d0ccb6c8a4b3187b8277e /cddl | |
| parent | 6a061d782c15d76b42527c756912404f8045fa94 (diff) | |
| download | FreeBSD-src-a0cba7035e79b9072daec4c39acf9bcb521b9f0e.zip FreeBSD-src-a0cba7035e79b9072daec4c39acf9bcb521b9f0e.tar.gz | |
Import illumos changeset 13564:cf89c0c60496
1946 incorrect formatting when listing output of multiple pools with
zpool iostat -v
References:
https://www.illumos.org/issues/1946
Obtained from: illumos (issue #1946)
MFC after: 1 week
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/zpool/zpool_main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c index 5d1e454..1e9f1de 100644 --- a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c +++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c @@ -23,6 +23,7 @@ * 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. * Copyright (c) 2011 Martin Matuska <mm@FreeBSD.org>. All rights reserved. */ @@ -2351,7 +2352,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); } /* |
