Sun Dec 8 14:39:07 2019 UTC ()
Pull up following revision(s) (requested by jmcneill in ticket #514):

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

Initialize b_dev before passing buf to d_minphys (ldminphys needs this)


(martin)
diff -r1.11.2.1 -r1.11.2.2 src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c
cvs diff -r1.11.2.1 -r1.11.2.2 src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c (expand / switch to unified diff)

--- src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c 2019/08/20 11:44:14 1.11.2.1
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c 2019/12/08 14:39:07 1.11.2.2
@@ -234,26 +234,27 @@ vdev_disk_open(vdev_t *vd, uint64_t *psi @@ -234,26 +234,27 @@ vdev_disk_open(vdev_t *vd, uint64_t *psi
234 } else { 234 } else {
235 const char *dev_name; 235 const char *dev_name;
236 236
237 dev_name = devsw_blk2name(major(vp->v_rdev)); 237 dev_name = devsw_blk2name(major(vp->v_rdev));
238 if (dev_name) { 238 if (dev_name) {
239 char disk_name[16]; 239 char disk_name[16];
240 240
241 snprintf(disk_name, sizeof(disk_name), "%s%d", 241 snprintf(disk_name, sizeof(disk_name), "%s%d",
242 dev_name, DISKUNIT(vp->v_rdev)); 242 dev_name, DISKUNIT(vp->v_rdev));
243 pdk = disk_find(disk_name); 243 pdk = disk_find(disk_name);
244 } else { 244 } else {
245 pdk = NULL; 245 pdk = NULL;
246 } 246 }
 247 buf.b_dev = vp->v_rdev;
247 } 248 }
248 if (pdk && pdk->dk_driver && pdk->dk_driver->d_minphys) 249 if (pdk && pdk->dk_driver && pdk->dk_driver->d_minphys)
249 (*pdk->dk_driver->d_minphys)(&buf); 250 (*pdk->dk_driver->d_minphys)(&buf);
250 dvd->vd_maxphys = buf.b_bcount; 251 dvd->vd_maxphys = buf.b_bcount;
251 } 252 }
252 253
253 /* 254 /*
254 * XXXNETBSD Compare the devid to the stored value. 255 * XXXNETBSD Compare the devid to the stored value.
255 */ 256 */
256 257
257 /* 258 /*
258 * Create a workqueue to process cache-flushes concurrently. 259 * Create a workqueue to process cache-flushes concurrently.
259 */ 260 */