Module Name: src
Committed By: mlelstv
Date: Sun Dec 8 12:15:24 UTC 2019
Modified Files:
src/sys/dev: dksubr.c dkvar.h
Log Message:
Drop now unused dk_lookup function.
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/sys/dev/dksubr.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/dkvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/dksubr.c
diff -u src/sys/dev/dksubr.c:1.110 src/sys/dev/dksubr.c:1.111
--- src/sys/dev/dksubr.c:1.110 Sat Oct 5 05:28:44 2019
+++ src/sys/dev/dksubr.c Sun Dec 8 12:15:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.110 2019/10/05 05:28:44 mlelstv Exp $ */
+/* $NetBSD: dksubr.c,v 1.111 2019/12/08 12:15:24 mlelstv Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.110 2019/10/05 05:28:44 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.111 2019/12/08 12:15:24 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -999,66 +999,6 @@ dk_makedisklabel(struct dk_softc *dksc)
lp->d_checksum = dkcksum(lp);
}
-/* This function is taken from ccd.c:1.76 --rcd */
-
-/*
- * XXX this function looks too generic for dksubr.c, shouldn't we
- * put it somewhere better?
- */
-
-/*
- * Lookup the provided name in the filesystem. If the file exists,
- * is a valid block device, and isn't being used by anyone else,
- * set *vpp to the file's vnode.
- */
-int
-dk_lookup(struct pathbuf *pb, struct lwp *l, struct vnode **vpp)
-{
- struct nameidata nd;
- struct vnode *vp;
- int error;
-
- if (l == NULL)
- return ESRCH; /* Is ESRCH the best choice? */
-
- NDINIT(&nd, LOOKUP, FOLLOW, pb);
- if ((error = vn_open(&nd, FREAD | FWRITE, 0)) != 0) {
- DPRINTF((DKDB_FOLLOW|DKDB_INIT),
- ("%s: vn_open error = %d\n", __func__, error));
- return error;
- }
-
- vp = nd.ni_vp;
- if (vp->v_type != VBLK) {
- error = ENOTBLK;
- goto out;
- }
-
- /* Reopen as anonymous vnode to protect against forced unmount. */
- if ((error = bdevvp(vp->v_rdev, vpp)) != 0)
- goto out;
- VOP_UNLOCK(vp);
- if ((error = vn_close(vp, FREAD | FWRITE, l->l_cred)) != 0) {
- vrele(*vpp);
- return error;
- }
- if ((error = VOP_OPEN(*vpp, FREAD | FWRITE, l->l_cred)) != 0) {
- vrele(*vpp);
- return error;
- }
- mutex_enter((*vpp)->v_interlock);
- (*vpp)->v_writecount++;
- mutex_exit((*vpp)->v_interlock);
-
- IFDEBUG(DKDB_VNODE, vprint("dk_lookup: vnode info", *vpp));
-
- return 0;
-out:
- VOP_UNLOCK(vp);
- (void) vn_close(vp, FREAD | FWRITE, l->l_cred);
- return error;
-}
-
MODULE(MODULE_CLASS_MISC, dk_subr, NULL);
static int
Index: src/sys/dev/dkvar.h
diff -u src/sys/dev/dkvar.h:1.30 src/sys/dev/dkvar.h:1.31
--- src/sys/dev/dkvar.h:1.30 Wed Nov 1 19:15:31 2017
+++ src/sys/dev/dkvar.h Sun Dec 8 12:15:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dkvar.h,v 1.30 2017/11/01 19:15:31 mlelstv Exp $ */
+/* $NetBSD: dkvar.h,v 1.31 2019/12/08 12:15:24 mlelstv Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -110,6 +110,4 @@ int dk_dump(struct dk_softc *, dev_t,
void dk_getdisklabel(struct dk_softc *, dev_t);
void dk_getdefaultlabel(struct dk_softc *, struct disklabel *);
-int dk_lookup(struct pathbuf *, struct lwp *, struct vnode **);
-
#endif /* ! _DEV_DKVAR_H_ */
