From owner-svn-src-stable@FreeBSD.ORG  Wed Jun  5 11:16:18 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 6CD0248C;
 Wed,  5 Jun 2013 11:16:18 +0000 (UTC) (envelope-from smh@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 5D5E211A2;
 Wed,  5 Jun 2013 11:16:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r55BGIiF055811;
 Wed, 5 Jun 2013 11:16:18 GMT (envelope-from smh@svn.freebsd.org)
Received: (from smh@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r55BGIUX055810;
 Wed, 5 Jun 2013 11:16:18 GMT (envelope-from smh@svn.freebsd.org)
Message-Id: <201306051116.r55BGIUX055810@svn.freebsd.org>
From: Steven Hartland <smh@FreeBSD.org>
Date: Wed, 5 Jun 2013 11:16:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251410 -
 stable/8/cddl/contrib/opensolaris/lib/libzfs/common
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Jun 2013 11:16:18 -0000

Author: smh
Date: Wed Jun  5 11:16:17 2013
New Revision: 251410
URL: http://svnweb.freebsd.org/changeset/base/251410

Log:
  MFC r245479:
  Report pools which have a removed l2cache disk under zpool status -x

Modified:
  stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c
Directory Properties:
  stable/8/cddl/contrib/opensolaris/   (props changed)
  stable/8/cddl/contrib/opensolaris/lib/libzfs/   (props changed)

Modified: stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c
==============================================================================
--- stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c	Wed Jun  5 10:53:27 2013	(r251409)
+++ stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c	Wed Jun  5 11:16:17 2013	(r251410)
@@ -150,6 +150,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);
 }