summaryrefslogtreecommitdiffstats
path: root/sys/boot/zfs
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2010-09-09 21:19:09 +0000
committerpjd <pjd@FreeBSD.org>2010-09-09 21:19:09 +0000
commitbeba890b255694555704cf00b8b103639cb1f4ee (patch)
tree851b0c2734b125fded1a35f9904b2e7241862051 /sys/boot/zfs
parent4cc2af01fbe4696ac7048b8d72a45f132175291a (diff)
downloadFreeBSD-src-beba890b255694555704cf00b8b103639cb1f4ee.zip
FreeBSD-src-beba890b255694555704cf00b8b103639cb1f4ee.tar.gz
Ignore log vdevs.
MFC after: 2 weeks
Diffstat (limited to 'sys/boot/zfs')
-rw-r--r--sys/boot/zfs/zfsimpl.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sys/boot/zfs/zfsimpl.c b/sys/boot/zfs/zfsimpl.c
index a4fd5be..979424e 100644
--- a/sys/boot/zfs/zfsimpl.c
+++ b/sys/boot/zfs/zfsimpl.c
@@ -773,6 +773,7 @@ vdev_probe(vdev_phys_read_t *read, void *read_priv, spa_t **spap)
uint64_t val;
uint64_t guid;
uint64_t pool_txg, pool_guid;
+ uint64_t is_log;
const char *pool_name;
const unsigned char *vdevs;
int i, rc, is_newer;
@@ -849,6 +850,12 @@ vdev_probe(vdev_phys_read_t *read, void *read_priv, spa_t **spap)
return (EIO);
}
+ is_log = 0;
+ (void) nvlist_find(nvlist, ZPOOL_CONFIG_IS_LOG, DATA_TYPE_UINT64, 0,
+ &is_log);
+ if (is_log)
+ return (EIO);
+
/*
* Create the pool if this is the first time we've seen it.
*/
OpenPOWER on IntegriCloud