svn commit: r309370 - stable/11/sys/boot/zfs

[Toomas Soome]

Author: tsoome
Date: Thu Dec  1 20:31:37 2016
New Revision: 309370
URL: https://svnweb.freebsd.org/changeset/base/309370

Log:
  Backing out r309368 as it got commited prematurely as we still do not
  provide skein feature support in boot loader.
  
  Approved by:	allanjude (mentor)

Modified:
  stable/11/sys/boot/zfs/zfsimpl.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/boot/zfs/zfsimpl.c
==============================================================================
--- stable/11/sys/boot/zfs/zfsimpl.c	Thu Dec  1 19:19:20 2016	(r309369)
+++ stable/11/sys/boot/zfs/zfsimpl.c	Thu Dec  1 20:31:37 2016	(r309370)
@@ -1017,10 +1017,8 @@ vdev_probe(vdev_phys_read_t *read, void 
 	STAILQ_FOREACH(pool_vdev, &spa->spa_vdevs, v_childlink)
 		if (top_vdev == pool_vdev)
 			break;
-	if (!pool_vdev && top_vdev) {
-		top_vdev->spa = spa;
+	if (!pool_vdev && top_vdev)
 		STAILQ_INSERT_TAIL(&spa->spa_vdevs, top_vdev, v_childlink);
-	}
 
 	/*
 	 * We should already have created an incomplete vdev for this