Thu Jun 25 09:39:15 2020 UTC ()

Don't assume everything is a wedge and has a parent device. On non-wedges
this crashes.

Instead, just talk to the referenced device and rely on the dk driver
to pass requests correctly.


(mlelstv)

diff -r1.17 -r1.18 src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c

--- src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c 2020/06/21 21:29:11	1.17
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c 2020/06/25 09:39:15	1.18

 @@ -212,39 +212,38 @@ vdev_disk_open(vdev_t *vd, uint64_t *psi
 	    &vp, CRCREAT, 0);
 	if (error != 0) {
 		vd->vdev_stat.vs_aux = VDEV_AUX_OPEN_FAILED;
 		return (SET_ERROR(error));
+	}
 	if (vp->v_type != VBLK) {
 		vrele(vp);
 		vd->vdev_stat.vs_aux = VDEV_AUX_OPEN_FAILED;
 		return (SET_ERROR(EINVAL));
+	}
 	pdk = NULL;
 	if (getdiskinfo(vp, &dkw) == 0)
-		pdk = disk_find(dkw.dkw_parent);
+		pdk = disk_find(dkw.dkw_devname);
 	/* XXXNETBSD Once tls-maxphys gets merged this block becomes:
 		dvd->vd_maxphys = (pdk ? disk_maxphys(pdk) : MACHINE_MAXPHYS);
 	*/
+	{
 		struct buf buf = {
 			.b_dev = vp->v_rdev,
 			.b_bcount = MAXPHYS,
 		};
-		if (pdk && pdk->dk_driver && pdk->dk_driver->d_minphys) {
+		if (pdk && pdk->dk_driver && pdk->dk_driver->d_minphys)
 			buf.b_dev = pdk->dk_rawvp->v_rdev;
 			(*pdk->dk_driver->d_minphys)(&buf);
 		dvd->vd_maxphys = buf.b_bcount;
+	}
 	/*
 	 * XXXNETBSD Compare the devid to the stored value.
 	 */
 	/*
 	 * Create a workqueue to process cache-flushes concurrently.
 	 */
 	error = workqueue_create(&dvd->vd_wq, "vdevsync",
 	    vdev_disk_flush, dvd, PRI_NONE, IPL_NONE, WQ_MPSAFE);
 	if (error != 0) {