Module Name: src
Committed By: christos
Date: Tue Dec 8 20:56:21 UTC 2015
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: vdev_disk.c
Log Message:
catch up with DIOCGPART -> DIOCGPARTINFO
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.5 src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.6
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.5 Sat Nov 19 21:54:25 2011
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c Tue Dec 8 15:56:21 2015
@@ -138,16 +138,16 @@ skip_open:
* 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.
