svn commit: r185852 - head/sys/boot/zfs
Doug Rabson
dfr at FreeBSD.org
Wed Dec 10 02:46:34 PST 2008
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.
More information about the svn-src-all
mailing list