svn commit: r212384 - head/sys/boot/zfs
Pawel Jakub Dawidek
pjd at FreeBSD.org
Thu Sep 9 21:19:10 UTC 2010
Author: pjd
Date: Thu Sep 9 21:19:09 2010
New Revision: 212384
URL: http://svn.freebsd.org/changeset/base/212384
Log:
Ignore log vdevs.
MFC after: 2 weeks
Modified:
head/sys/boot/zfs/zfsimpl.c
Modified: head/sys/boot/zfs/zfsimpl.c
==============================================================================
--- head/sys/boot/zfs/zfsimpl.c Thu Sep 9 21:18:00 2010 (r212383)
+++ head/sys/boot/zfs/zfsimpl.c Thu Sep 9 21:19:09 2010 (r212384)
@@ -773,6 +773,7 @@ vdev_probe(vdev_phys_read_t *read, void
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
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.
*/
More information about the svn-src-all
mailing list