summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2013-06-25 21:34:21 +0000
committerdelphij <delphij@FreeBSD.org>2013-06-25 21:34:21 +0000
commitba5c08093064b10781f8350bcad92db94868aa1d (patch)
treee1fbbc6e72d184a4ac7c56f2012e30f1eb10e3e6
parent594309ff983169fe62ffeaa0d1a567cd9f172d56 (diff)
downloadFreeBSD-src-ba5c08093064b10781f8350bcad92db94868aa1d.zip
FreeBSD-src-ba5c08093064b10781f8350bcad92db94868aa1d.tar.gz
Update vendor/illumos/dist to illumos-gate 14056:812b3d1ca0a0
Illumos ZFS issues: 3818 zpool status -x should report pools with removed l2arc devices
-rw-r--r--lib/libzfs/common/libzfs_status.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/libzfs/common/libzfs_status.c b/lib/libzfs/common/libzfs_status.c
index 560bacd..71b27a1 100644
--- a/lib/libzfs/common/libzfs_status.c
+++ b/lib/libzfs/common/libzfs_status.c
@@ -22,6 +22,7 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
*/
/*
@@ -150,6 +151,16 @@ find_vdev_problem(nvlist_t *vdev, int (*func)(uint64_t, uint64_t, uint64_t))
return (B_TRUE);
}
+ /*
+ * Check any L2 cache devs
+ */
+ if (nvlist_lookup_nvlist_array(vdev, ZPOOL_CONFIG_L2CACHE, &child,
+ &children) == 0) {
+ for (c = 0; c < children; c++)
+ if (find_vdev_problem(child[c], func))
+ return (B_TRUE);
+ }
+
return (B_FALSE);
}
OpenPOWER on IntegriCloud