Author: mav
Date: Sun Mar 20 23:54:59 2016
New Revision: 297097
URL: https://svnweb.freebsd.org/changeset/base/297097
Log:
MFC r294805: MFV r294804:
6386 Fix function call with uninitialized value in vdev_inuse
Reviewed by: Brian Behlendorf <behlendo...@llnl.gov>
Reviewed by: Matthew Ahrens <mahr...@delphix.com>
Reviewed by: Dan Kimmel <dan.kim...@delphix.com>
Approved by: Robert Mustacchi <r...@joyent.com>
Author: Richard Yao <r...@gentoo.org>
illumos/illumos-gate@5bdd995ddb777f538bfbcc5e2d5ff1bed07ae56e
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
Sun Mar 20 23:54:05 2016 (r297096)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
Sun Mar 20 23:54:59 2016 (r297097)
@@ -602,7 +602,8 @@ vdev_inuse(vdev_t *vd, uint64_t crtxg, v
* read-only. Instead we look to see if the pools is marked
* read-only in the namespace and set the state to active.
*/
- if ((spa = spa_by_guid(pool_guid, device_guid)) != NULL &&
+ if (state != POOL_STATE_SPARE && state != POOL_STATE_L2CACHE &&
+ (spa = spa_by_guid(pool_guid, device_guid)) != NULL &&
spa_mode(spa) == FREAD)
state = POOL_STATE_ACTIVE;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
