[src/netbsd-9]: src/external/cddl/osnet/dist/uts/common/fs/zfs Pull up follow...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c0e927ee8a2f
branches:  netbsd-9
changeset: 935350:c0e927ee8a2f
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Jun 30 17:55:35 2020 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #970):

        external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c: revision 1.17
        external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c: revision 1.18

If calling d_minphys on the parent disk device, make sure we use the
parent disk device's dev_t. Fixes zfs on wedges on ld(4).
XXX pullup-9

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.

diffstat:

 external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r b63528077461 -r c0e927ee8a2f external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c    Sun Jun 21 10:41:59 2020 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c    Tue Jun 30 17:55:35 2020 +0000
@@ -222,7 +222,7 @@
 
        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);