[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/930738aa9818
branches:  netbsd-9
changeset: 458229:930738aa9818
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Aug 20 11:44:14 2019 +0000

description:
Pull up following revision(s) (requested by hannken in ticket #101):

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

Rearrange the evaluation of "dvd_maxphys" so it works for wedges too.

diffstat:

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

diffs (47 lines):

diff -r 908924dac9b0 -r 930738aa9818 external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c    Tue Aug 20 11:42:35 2019 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c    Tue Aug 20 11:44:14 2019 +0000
@@ -220,23 +220,33 @@
        }
 
        /* XXXNETBSD Once tls-maxphys gets merged this block becomes:
-               pdk = disk_find_blk(vp->v_rdev);
+               if (VOP_IOCTL(vp, DIOCGWEDGEINFO, &dkw, FREAD, NOCRED) == 0)
+                       pdk = disk_find(dkw.dkw_parent);
+               else
+                       pdk = disk_find_blk(vp->v_rdev);
                dvd->vd_maxphys = (pdk ? disk_maxphys(pdk) : MACHINE_MAXPHYS);
        */
        {
                struct buf buf = { .b_bcount = MAXPHYS };
-               const char *dev_name;
 
-               dev_name = devsw_blk2name(major(vp->v_rdev));
-               if (dev_name) {
-                       char disk_name[16];
+               if (VOP_IOCTL(vp, DIOCGWEDGEINFO, &dkw, FREAD, NOCRED) == 0) {
+                       pdk = disk_find(dkw.dkw_parent);
+               } else {
+                       const char *dev_name;
+
+                       dev_name = devsw_blk2name(major(vp->v_rdev));
+                       if (dev_name) {
+                               char disk_name[16];
 
-                       snprintf(disk_name, sizeof(disk_name), "%s%d",
-                           dev_name, DISKUNIT(vp->v_rdev));
-                       pdk = disk_find(disk_name);
-                       if (pdk && pdk->dk_driver && pdk->dk_driver->d_minphys)
-                               (*pdk->dk_driver->d_minphys)(&buf);
+                               snprintf(disk_name, sizeof(disk_name), "%s%d",
+                                   dev_name, DISKUNIT(vp->v_rdev));
+                               pdk = disk_find(disk_name);
+                       } else {
+                               pdk = NULL;
+                       }
                }
+               if (pdk && pdk->dk_driver && pdk->dk_driver->d_minphys)
+                       (*pdk->dk_driver->d_minphys)(&buf);
                dvd->vd_maxphys = buf.b_bcount;
        }