MFV r289535: 5767 fix several problems with zfs test suite

Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Approved by: Gordon Ross <gwr@nexenta.com>
Author: John Wren Kennedy <john.kennedy@delphix.com>

illumos/illumos-gate@52244c0958bdf281ca42932b449f644b4decfdc2

In fact, only unrelated part of that commit is applicable:
8. zpool list -v doesn't print spares
It also doesn't correctly identify log devices.

diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
index a3eabd1e0eb42758712944d2d43972ecfe237c22..52ad81d0598861f3c6400ddb815722d93d654032 100644 (file)
--- a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
@@ -2940,6 +2940,9 @@ print_list_stats(zpool_handle_t *zhp, const char *name, nvlist_t *nv,
        uint_t c, children;
        char *vname;
        boolean_t scripted = cb->cb_scripted;
+       uint64_t islog = B_FALSE;
+       boolean_t haslog = B_FALSE;
+       char *dashes = "%-*s      -      -      -         -      -      -\n";
 
        verify(nvlist_lookup_uint64_array(nv, ZPOOL_CONFIG_VDEV_STATS,
            (uint64_t **)&vs, &c) == 0);
@@ -2990,24 +2993,47 @@ print_list_stats(zpool_handle_t *zhp, const char *name, nvlist_t *nv,
                    ZPOOL_CONFIG_IS_HOLE, &ishole) == 0 && ishole)
                        continue;
 
+               if (nvlist_lookup_uint64(child[c],
+                   ZPOOL_CONFIG_IS_LOG, &islog) == 0 && islog) {
+                       haslog = B_TRUE;
+                       continue;
+               }
+
                vname = zpool_vdev_name(g_zfs, zhp, child[c], B_FALSE);
                print_list_stats(zhp, vname, child[c], cb, depth + 2);
                free(vname);
        }
 
-       /*
-        * Include level 2 ARC devices in iostat output
-        */
+       if (haslog == B_TRUE) {
+               /* LINTED E_SEC_PRINTF_VAR_FMT */
+               (void) printf(dashes, cb->cb_namewidth, "log");
+               for (c = 0; c < children; c++) {
+                       if (nvlist_lookup_uint64(child[c], ZPOOL_CONFIG_IS_LOG,
+                           &islog) != 0 || !islog)
+                               continue;
+                       vname = zpool_vdev_name(g_zfs, zhp, child[c], B_FALSE);
+                       print_list_stats(zhp, vname, child[c], cb, depth + 2);
+                       free(vname);
+               }
+       }
+
        if (nvlist_lookup_nvlist_array(nv, ZPOOL_CONFIG_L2CACHE,
-           &child, &children) != 0)
-               return;
+           &child, &children) == 0 && children > 0) {
+               /* LINTED E_SEC_PRINTF_VAR_FMT */
+               (void) printf(dashes, cb->cb_namewidth, "cache");
+               for (c = 0; c < children; c++) {
+                       vname = zpool_vdev_name(g_zfs, zhp, child[c], B_FALSE);
+                       print_list_stats(zhp, vname, child[c], cb, depth + 2);
+                       free(vname);
+               }
+       }
 
-       if (children > 0) {
-               (void) printf("%-*s      -      -      -      -      -      "
-                   "-\n", cb->cb_namewidth, "cache");
+       if (nvlist_lookup_nvlist_array(nv, ZPOOL_CONFIG_SPARES, &child,
+           &children) == 0 && children > 0) {
+               /* LINTED E_SEC_PRINTF_VAR_FMT */
+               (void) printf(dashes, cb->cb_namewidth, "spare");
                for (c = 0; c < children; c++) {
-                       vname = zpool_vdev_name(g_zfs, zhp, child[c],
-                           B_FALSE);
+                       vname = zpool_vdev_name(g_zfs, zhp, child[c], B_FALSE);
                        print_list_stats(zhp, vname, child[c], cb, depth + 2);
                        free(vname);
                }