[src/trunk]: src/external/cddl/osnet/dist/uts/common/fs/zfs If calling d_minp...

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

details:   https://anonhg.NetBSD.org/src/rev/794293eb1c78
branches:  trunk
changeset: 934988:794293eb1c78
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Jun 21 21:29:11 2020 +0000

description:
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

diffstat:

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

diffs (18 lines):

diff -r 8932c2a379e6 -r 794293eb1c78 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 19:39:11 2020 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c    Sun Jun 21 21:29:11 2020 +0000
@@ -229,11 +229,12 @@
        */
        {
                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;
        }