Author: avg
Date: Fri Oct 26 14:50:16 2012
New Revision: 242135
URL: http://svn.freebsd.org/changeset/base/242135
Log:
zfs: fix label validation code in vdev_geom_read_config
POOL_STATE_SPARE and POOL_STATE_L2CACHE were not handled correctly
and thus the cache and spare disks would not be correctly probed.
Reported by: Michael Schmiedgen <schmied...@gmx.net>,
Matthew D. Fuller <fulle...@over-yonder.net>
Tested by: Michael Schmiedgen <schmied...@gmx.net>,
flo
MFC after: 5 days
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c Fri Oct
26 14:36:02 2012 (r242134)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c Fri Oct
26 14:50:16 2012 (r242135)
@@ -270,14 +270,16 @@ vdev_geom_read_config(struct g_consumer
continue;
if (nvlist_lookup_uint64(*config, ZPOOL_CONFIG_POOL_STATE,
- &state) != 0 || state >= POOL_STATE_DESTROYED) {
+ &state) != 0 || state == POOL_STATE_DESTROYED ||
+ state > POOL_STATE_L2CACHE) {
nvlist_free(*config);
*config = NULL;
continue;
}
- if (nvlist_lookup_uint64(*config, ZPOOL_CONFIG_POOL_TXG,
- &txg) != 0 || txg == 0) {
+ if (state != POOL_STATE_SPARE && state != POOL_STATE_L2CACHE &&
+ (nvlist_lookup_uint64(*config, ZPOOL_CONFIG_POOL_TXG,
+ &txg) != 0 || txg == 0)) {
nvlist_free(*config);
*config = NULL;
continue;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
