 @@ -1,14 +1,14 @@
-/*	$NetBSD: ccd.c,v 1.180 2019/08/07 00:38:01 pgoyette Exp $	*/
+/*	$NetBSD: ccd.c,v 1.181 2019/12/08 12:14:40 mlelstv Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -78,27 +78,27 @@
  *    sc_stop, sc_bufq and b_resid from master buffers.
+ *
  * => a combination of CCDF_INITED, sc_inflight, and sc_iolock is used to
  *    serialize I/O and configuration changes.
+ *
  * => the in-core disk label does not change while the device is open.
+ *
  * On memory consumption: ccd fans out I/O requests and so needs to
  * allocate memory.  If the system is desperately low on memory, we
  * single thread I/O.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.180 2019/08/07 00:38:01 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.181 2019/12/08 12:14:40 mlelstv Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/buf.h>
 #include <sys/kmem.h>
 #include <sys/pool.h>
 #include <sys/module.h>
 #include <sys/namei.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 @@ -1212,27 +1212,27 @@ ccdioctl(dev_t dev, u_long cmd, void *da
 		if (ccddebug & CCDB_INIT)
 			for (i = 0; i < ccio->ccio_ndisks; ++i)
 				printf("ccdioctl: component %d: %p\n",
 				    i, cpp[i]);
 #endif
 		for (i = 0; i < ccio->ccio_ndisks; ++i) {
 #ifdef DEBUG
 			if (ccddebug & CCDB_INIT)
 				printf("ccdioctl: lookedup = %d\n", lookedup);
 #endif
 			error = pathbuf_copyin(cpp[i], &pb);
 			if (error == 0) {
-				error = dk_lookup(pb, l, &vpp[i]);
+				error = vn_bdev_openpath(pb, &vpp[i], l);
+			}
 			pathbuf_destroy(pb);
 			if (error != 0) {
 				for (j = 0; j < lookedup; ++j)
 					(void)vn_close(vpp[j], FREAD|FWRITE,
 					    uc);
 				kmem_free(vpp, ccio->ccio_ndisks *
 				    sizeof(*vpp));
 				kmem_free(cpp, ccio->ccio_ndisks *
 				    sizeof(*cpp));
 				goto out;
+			}
 			++lookedup;

 @@ -1,14 +1,14 @@
-/* $NetBSD: cgd.c,v 1.116 2018/01/23 22:42:29 pgoyette Exp $ */
+/* $NetBSD: cgd.c,v 1.117 2019/12/08 12:14:40 mlelstv Exp $ */
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Roland C. Dowdeswell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.116 2018/01/23 22:42:29 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.117 2019/12/08 12:14:40 mlelstv Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/pool.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
 @@ -772,27 +772,27 @@ cgd_ioctl_set(struct cgd_softc *cs, void
 	size_t	 i;
 	size_t	 keybytes;			/* key length in bytes */
 	const char *cp;
 	struct pathbuf *pb;
 	char	 *inbuf;
 	struct dk_softc *dksc = &cs->sc_dksc;
 	cp = ci->ci_disk;
 	ret = pathbuf_copyin(ci->ci_disk, &pb);
 	if (ret != 0) {
 		return ret;
+	}
-	ret = dk_lookup(pb, l, &vp);
+	ret = vn_bdev_openpath(pb, &vp, l);
 	pathbuf_destroy(pb);
 	if (ret != 0) {
 		return ret;
+	}
 	inbuf = malloc(MAX_KEYSIZE, M_TEMP, M_WAITOK);
 	if ((ret = cgdinit(cs, cp, vp, l)) != 0)
 		goto bail;
 	(void)memset(inbuf, 0, MAX_KEYSIZE);
 	ret = copyinstr(ci->ci_alg, inbuf, 256, NULL);
 	if (ret)

 @@ -1,14 +1,14 @@
-/*        $NetBSD: dm_pdev.c,v 1.18 2019/12/07 15:28:39 tkusumi Exp $      */
+/*        $NetBSD: dm_pdev.c,v 1.19 2019/12/08 12:14:40 mlelstv Exp $      */
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Adam Hamsik.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -19,27 +19,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_pdev.c,v 1.18 2019/12/07 15:28:39 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_pdev.c,v 1.19 2019/12/08 12:14:40 mlelstv Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/disk.h>
 #include <sys/fcntl.h>
 #include <sys/kmem.h>
 #include <sys/namei.h>
 #include <dev/dkvar.h>
 #include "dm.h"
 @@ -106,30 +106,30 @@ dm_pdev_insert(const char *dev_name)
 	if ((dmp = dm_pdev_alloc(dev_name)) == NULL) {
 		mutex_exit(&dm_pdev_mutex);
 		return NULL;
+	}
 	dev_pb = pathbuf_create(dev_name);
 	if (dev_pb == NULL) {
 		aprint_debug("%s: pathbuf_create on device: %s failed!\n",
 		    __func__, dev_name);
 		mutex_exit(&dm_pdev_mutex);
 		kmem_free(dmp, sizeof(dm_pdev_t));
 		return NULL;
+	}
-	error = dk_lookup(dev_pb, curlwp, &dmp->pdev_vnode);
+	error = vn_bdev_openpath(dev_pb, &dmp->pdev_vnode, curlwp);
 	pathbuf_destroy(dev_pb);
 	if (error) {
-		aprint_debug("%s: dk_lookup on device: %s (error %d)\n",
+		aprint_debug("%s: lookup on device: %s (error %d)\n",
 		    __func__, dev_name, error);
 		mutex_exit(&dm_pdev_mutex);
 		kmem_free(dmp, sizeof(dm_pdev_t));
 		return NULL;
+	}
 	getdisksize(dmp->pdev_vnode, &dmp->pdev_numsec, &dmp->pdev_secsize);
 	dmp->ref_cnt = 1;
 	SLIST_INSERT_HEAD(&dm_pdev_list, dmp, next_pdev);
 	mutex_exit(&dm_pdev_mutex);
 	return dmp;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rf_copyback.c,v 1.52 2019/10/10 03:43:59 christos Exp $	*/
+/*	$NetBSD: rf_copyback.c,v 1.53 2019/12/08 12:14:40 mlelstv Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
+ *
  * Author: Mark Holland
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
 @@ -28,27 +28,27 @@
 /*****************************************************************************
+ *
  * copyback.c -- code to copy reconstructed data back from spare space to
  *               the replaced disk.
+ *
  * the code operates using callbacks on the I/Os to continue with the
  * next unit to be copied back.  We do this because a simple loop
  * containing blocking I/Os will not work in the simulator.
+ *
  ****************************************************************************/
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_copyback.c,v 1.52 2019/10/10 03:43:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_copyback.c,v 1.53 2019/12/08 12:14:40 mlelstv Exp $");
 #include <dev/raidframe/raidframevar.h>
 #include <sys/time.h>
 #include <sys/buf.h>
 #include "rf_raid.h"
 #include "rf_mcpair.h"
 #include "rf_acctrace.h"
 #include "rf_etimer.h"
 #include "rf_general.h"
 #include "rf_utils.h"
 #include "rf_copyback.h"
 #include "rf_decluster.h"
 @@ -134,31 +134,31 @@ rf_CopybackReconstructedData(RF_Raid_t *
 	raidPtr->Disks[fcol].auto_configured = 0;
 	printf("About to (re-)open the device: %s\n",
 	    raidPtr->Disks[fcol].devname);
 	dev_pb = pathbuf_create(raidPtr->Disks[fcol].devname);
 	if (dev_pb == NULL) {
 		/* shouldn't happen unless maybe the system is OOMing */
 		printf("raid%d: copyback: pathbuf_create on device: %s failed: %d!\n",
 		       raidPtr->raidid, raidPtr->Disks[fcol].devname,
 		       ENOMEM);
 		return;
+	}
-	retcode = dk_lookup(dev_pb, curlwp, &vp);
+	retcode = vn_bdev_openpath(dev_pb, &vp, curlwp);
 	pathbuf_destroy(dev_pb);
 	if (retcode) {
-		printf("raid%d: copyback: dk_lookup on device: %s failed: %d!\n",
+		printf("raid%d: copyback: open device: %s failed: %d!\n",
 		       raidPtr->raidid, raidPtr->Disks[fcol].devname,
 		       retcode);
 		/* XXX the component isn't responding properly... must be
 		 * still dead :-( */
 		return;
 	} else {
 		/* Ok, so we can at least do a lookup... How about actually
 		 * getting a vp for it? */
 		retcode = rf_getdisksize(vp, &raidPtr->Disks[fcol]);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rf_disks.c,v 1.91 2019/02/09 03:34:00 christos Exp $	*/
+/*	$NetBSD: rf_disks.c,v 1.92 2019/12/08 12:14:40 mlelstv Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Greg Oster
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -50,27 +50,27 @@
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 /***************************************************************
  * rf_disks.c -- code to perform operations on the actual disks
  ***************************************************************/
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.91 2019/02/09 03:34:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.92 2019/12/08 12:14:40 mlelstv Exp $");
 #include <dev/raidframe/raidframevar.h>
 #include "rf_raid.h"
 #include "rf_alloclist.h"
 #include "rf_utils.h"
 #include "rf_general.h"
 #include "rf_options.h"
 #include "rf_kintf.h"
 #include "rf_netbsd.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 @@ -594,30 +594,30 @@ rf_ConfigureDisk(RF_Raid_t *raidPtr, cha
 		printf("Ignoring missing component at column %d\n", col);
 		snprintf(diskPtr->devname, sizeof(diskPtr->devname),
 		    "component%d", col);
 		diskPtr->status = rf_ds_failed;
 		return (0);
+	}
 	pb = pathbuf_create(diskPtr->devname);
 	if (pb == NULL) {
 		printf("pathbuf_create for device: %s failed!\n",
 		       diskPtr->devname);
 		return ENOMEM;
+	}
-	error = dk_lookup(pb, curlwp, &vp);
+	error = vn_bdev_openpath(pb, &vp, curlwp);
 	pathbuf_destroy(pb);
 	if (error) {
-		printf("dk_lookup on device: %s failed!\n", diskPtr->devname);
+		printf("open device: %s failed!\n", diskPtr->devname);
 		if (error == ENXIO) {
 			/* the component isn't there... must be dead :-( */
 			diskPtr->status = rf_ds_failed;
 			return 0;
 		} else {
 			return (error);
+		}
+	}
 	if ((error = rf_getdisksize(vp, diskPtr)) != 0)
 		return (error);
 	/*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rf_reconstruct.c,v 1.123 2019/10/10 03:43:59 christos Exp $	*/
+/*	$NetBSD: rf_reconstruct.c,v 1.124 2019/12/08 12:14:40 mlelstv Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
+ *
  * Author: Mark Holland
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
 @@ -23,27 +23,27 @@
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 /************************************************************
+ *
  * rf_reconstruct.c -- code to perform on-line reconstruction
+ *
  ************************************************************/
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.123 2019/10/10 03:43:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.124 2019/12/08 12:14:40 mlelstv Exp $");
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/buf.h>
 #include <sys/errno.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/vnode.h>
 #include <sys/namei.h> /* for pathbuf */
 #include <dev/raidframe/raidframevar.h>
 @@ -433,32 +433,32 @@ rf_ReconstructInPlace(RF_Raid_t *raidPtr
+	}
 	/* note that this disk was *not* auto_configured (any longer)*/
 	raidPtr->Disks[col].auto_configured = 0;
 #if 0
 	printf("About to (re-)open the device for rebuilding: %s\n",
 	       raidPtr->Disks[col].devname);
 #endif
 	rf_unlock_mutex2(raidPtr->mutex);
 	pb = pathbuf_create(raidPtr->Disks[col].devname);
 	if (pb == NULL) {
 		retcode = ENOMEM;
 	} else {
-		retcode = dk_lookup(pb, curlwp, &vp);
+		retcode = vn_bdev_openpath(pb, &vp, curlwp);
 		pathbuf_destroy(pb);
+	}
 	if (retcode) {
-		printf("raid%d: rebuilding: dk_lookup on device: %s failed: %d!\n",raidPtr->raidid,
+		printf("raid%d: rebuilding: open device: %s failed: %d!\n",raidPtr->raidid,
 		       raidPtr->Disks[col].devname, retcode);
 		/* the component isn't responding properly...
 		   must be still dead :-( */
 		rf_lock_mutex2(raidPtr->mutex);
 		raidPtr->reconInProgress--;
 		rf_signal_cond2(raidPtr->waitForReconCond);
 		rf_unlock_mutex2(raidPtr->mutex);
 		return(retcode);
+	}
 	/* Ok, so we can at least do a lookup...
 	   How about actually getting a vp for it? */