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

[Toomas Soome]

Author: tsoome
Date: Thu Dec  1 19:06:09 2016
New Revision: 309368
URL: https://svnweb.freebsd.org/changeset/base/309368

Log:
  MFC r308776
  
  loader: zfs toplevel vdev must have spa set.
  
  PR:		214375
  Reported by:	lstewart
  Reviewed by:	allanjude, imp
  Approved by:	allanjude (mentor), imp (mentor)
  Differential Revision:	https://reviews.freebsd.org/D8487

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 17:36:31 2016	(r309367)
+++ stable/11/sys/boot/zfs/zfsimpl.c	Thu Dec  1 19:06:09 2016	(r309368)
@@ -1017,8 +1017,10 @@ 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)
+	if (!pool_vdev && top_vdev) {
+		top_vdev->spa = spa;
 		STAILQ_INSERT_TAIL(&spa->spa_vdevs, top_vdev, v_childlink);
+	}
 
 	/*
 	 * We should already have created an incomplete vdev for this