svn commit: r297957 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Alexander Motin]

Author: mav
Date: Thu Apr 14 09:10:09 2016
New Revision: 297957
URL: https://svnweb.freebsd.org/changeset/base/297957

Log:
  MFC r297672: Alike to r293708 relax pool check in vdev_geom_open_by_path().
  
  This made impossible spare disk open by known path, which kind of worked
  only because the same fix was applied to vdev_geom_attach_by_guids() in
  r293708.

Modified:
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c	Thu Apr 14 07:23:37 2016	(r297956)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c	Thu Apr 14 09:10:09 2016	(r297957)
@@ -676,7 +676,15 @@ vdev_geom_open_by_path(vdev_t *vd, int c
 			g_topology_unlock();
 			vdev_geom_read_guids(cp, &pguid, &vguid);
 			g_topology_lock();
-			if (pguid != spa_guid(vd->vdev_spa) ||
+			/*
+			 * Check that the label's vdev guid matches the
+			 * desired guid.  If the label has a pool guid,
+			 * check that it matches too. (Inactive spares
+			 * and L2ARCs do not have any pool guid in the
+			 * label.)
+			 */
+			if ((pguid != 0 &&
+			    pguid != spa_guid(vd->vdev_spa)) ||
 			    vguid != vd->vdev_guid) {
 				vdev_geom_close_locked(vd);
 				cp = NULL;