[src/trunk]: src/external/cddl/osnet/dist/uts/common/fs/zfs catch up with DIO...

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

details:   https://anonhg.NetBSD.org/src/rev/0adcce5bc464
branches:  trunk
changeset: 342143:0adcce5bc464
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Dec 08 20:56:21 2015 +0000

description:
catch up with DIOCGPART -> DIOCGPARTINFO

diffstat:

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

diffs (24 lines):

diff -r 4db90b98ad8f -r 0adcce5bc464 external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c    Tue Dec 08 20:36:14 2015 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c    Tue Dec 08 20:56:21 2015 +0000
@@ -138,16 +138,16 @@
         * Determine the actual size of the device.
         * XXXNETBSD wedges.
         */
-       error = VOP_IOCTL(vp, DIOCGPART, &pinfo, FREAD|FWRITE,
+       error = VOP_IOCTL(vp, DIOCGPARTINFO, &pinfo, FREAD|FWRITE,
            kauth_cred_get());
        if (error != 0) {
                vrele(vp);
                vd->vdev_stat.vs_aux = VDEV_AUX_OPEN_FAILED;
                return error;
        }
-       *psize = (uint64_t)pinfo.part->p_size * pinfo.disklab->d_secsize;
-       *ashift = highbit(MAX(pinfo.disklab->d_secsize, SPA_MINBLOCKSIZE)) - 1;
-       vd->vdev_wholedisk = (pinfo.part->p_offset == 0); /* XXXNETBSD */
+       *psize = pinfo.pi_size * pinfo.pi_secsize;
+       *ashift = highbit(MAX(pinfo.pi_secsize, SPA_MINBLOCKSIZE)) - 1;
+       vd->vdev_wholedisk = (pinfo.pi_offset == 0); /* XXXNETBSD */
 
        /*
         * Create a workqueue to process cache-flushes concurrently.