From owner-svn-src-vendor@FreeBSD.ORG Tue Jun 25 21:34:22 2013 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3C59599B; Tue, 25 Jun 2013 21:34:22 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 2DB291880; Tue, 25 Jun 2013 21:34:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5PLYLKj061660; Tue, 25 Jun 2013 21:34:21 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5PLYLJE061659; Tue, 25 Jun 2013 21:34:21 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201306252134.r5PLYLJE061659@svn.freebsd.org> From: Xin LI Date: Tue, 25 Jun 2013 21:34:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r252213 - vendor/illumos/dist/lib/libzfs/common X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jun 2013 21:34:22 -0000 Author: delphij Date: Tue Jun 25 21:34:21 2013 New Revision: 252213 URL: http://svnweb.freebsd.org/changeset/base/252213 Log: Update vendor/illumos/dist to illumos-gate 14056:812b3d1ca0a0 Illumos ZFS issues: 3818 zpool status -x should report pools with removed l2arc devices Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_status.c Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_status.c ============================================================================== --- vendor/illumos/dist/lib/libzfs/common/libzfs_status.c Tue Jun 25 20:23:08 2013 (r252212) +++ vendor/illumos/dist/lib/libzfs/common/libzfs_status.c Tue Jun 25 21:34:21 2013 (r252213) @@ -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 (* 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); }