From owner-svn-src-head@FreeBSD.ORG  Wed Dec 10 10:46:34 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B45471065680;
	Wed, 10 Dec 2008 10:46:34 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A4FA78FC1B;
	Wed, 10 Dec 2008 10:46:34 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBAAkYH5026189;
	Wed, 10 Dec 2008 10:46:34 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBAAkYk5026188;
	Wed, 10 Dec 2008 10:46:34 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200812101046.mBAAkYk5026188@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Wed, 10 Dec 2008 10:46:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185852 - head/sys/boot/zfs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Dec 2008 10:46:34 -0000

Author: dfr
Date: Wed Dec 10 10:46:34 2008
New Revision: 185852
URL: http://svn.freebsd.org/changeset/base/185852

Log:
  Don't get confused if we encounter a device which is part of a raidz or raidz2
  pool while probing for vdevs.
  
  PR:		129539
  Submitted by:	Paul Wootton (paul at fletchermoorland dot co dot uk)

Modified:
  head/sys/boot/zfs/zfsimpl.c

Modified: head/sys/boot/zfs/zfsimpl.c
==============================================================================
--- head/sys/boot/zfs/zfsimpl.c	Wed Dec 10 10:21:54 2008	(r185851)
+++ head/sys/boot/zfs/zfsimpl.c	Wed Dec 10 10:46:34 2008	(r185852)
@@ -623,7 +623,7 @@ vdev_probe(vdev_read_t *read, void *read
 	uint64_t pool_txg, pool_guid;
 	const char *pool_name;
 	const unsigned char *vdevs;
-	int i;
+	int i, rc;
 	char upbuf[1024];
 	const struct uberblock *up;
 
@@ -723,7 +723,9 @@ vdev_probe(vdev_read_t *read, void *read
 			DATA_TYPE_NVLIST, 0, &vdevs)) {
 		return (EIO);
 	}
-	vdev_init_from_nvlist(vdevs, &top_vdev);
+	rc = vdev_init_from_nvlist(vdevs, &top_vdev);
+	if (rc)
+		return (rc);
 
 	/*
 	 * Add the toplevel vdev to the pool if its not already there.