Module Name: src
Committed By: martin
Date: Tue Jun 30 17:55:35 UTC 2020
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs [netbsd-9]: vdev_disk.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.11.2.4 -r1.11.2.5 \
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.11.2.4 src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.11.2.5
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.11.2.4 Wed Apr 29 13:45:38 2020
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c Tue Jun 30 17:55:35 2020
@@ -222,7 +222,7 @@ vdev_disk_open(vdev_t *vd, uint64_t *psi
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);
