Sun Dec 8 12:14:41 2019 UTC ()
Switch to vn_bdev_open* functions.
(mlelstv)
diff -r1.180 -r1.181 src/sys/dev/ccd.c
diff -r1.116 -r1.117 src/sys/dev/cgd.c
diff -r1.18 -r1.19 src/sys/dev/dm/dm_pdev.c
diff -r1.52 -r1.53 src/sys/dev/raidframe/rf_copyback.c
diff -r1.91 -r1.92 src/sys/dev/raidframe/rf_disks.c
diff -r1.123 -r1.124 src/sys/dev/raidframe/rf_reconstruct.c
--- src/sys/dev/ccd.c 2019/08/07 00:38:01 1.180
+++ src/sys/dev/ccd.c 2019/12/08 12:14:40 1.181
@@ -1,4 +1,4 @@
-/* $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.
@@ -88,7 +88,7 @@
*/
#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>
@@ -1222,7 +1222,7 @@
#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) {
--- src/sys/dev/cgd.c 2018/01/23 22:42:29 1.116
+++ src/sys/dev/cgd.c 2019/12/08 12:14:40 1.117
@@ -1,4 +1,4 @@
-/* $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.
@@ -30,7 +30,7 @@
*/
#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>
@@ -782,7 +782,7 @@
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;
--- src/sys/dev/dm/dm_pdev.c 2019/12/07 15:28:39 1.18
+++ src/sys/dev/dm/dm_pdev.c 2019/12/08 12:14:40 1.19
@@ -1,4 +1,4 @@
-/* $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.
@@ -29,7 +29,7 @@
* 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>
@@ -116,10 +116,10 @@
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));
--- src/sys/dev/raidframe/rf_copyback.c 2019/10/10 03:43:59 1.52
+++ src/sys/dev/raidframe/rf_copyback.c 2019/12/08 12:14:40 1.53
@@ -1,4 +1,4 @@
-/* $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.
@@ -38,7 +38,7 @@
****************************************************************************/
#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>
@@ -144,11 +144,11 @@
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);
--- src/sys/dev/raidframe/rf_disks.c 2019/02/09 03:34:00 1.91
+++ src/sys/dev/raidframe/rf_disks.c 2019/12/08 12:14:40 1.92
@@ -1,4 +1,4 @@
-/* $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.
@@ -60,7 +60,7 @@
***************************************************************/
#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>
@@ -604,10 +604,10 @@
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;
--- src/sys/dev/raidframe/rf_reconstruct.c 2019/10/10 03:43:59 1.123
+++ src/sys/dev/raidframe/rf_reconstruct.c 2019/12/08 12:14:40 1.124
@@ -1,4 +1,4 @@
-/* $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.
@@ -33,7 +33,7 @@
************************************************************/
#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>
@@ -443,12 +443,12 @@
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...