Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use dk_lookup.

Browse Source
This commit is contained in:
christos 2006-08-27 04:58:40 +00:00
parent 9472fb0cb6
commit 1a789da3ec
1 changed files with 4 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
sys/dev/ccd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ccd.c,v 1.112 2006/07/21 16:48:47 ad Exp $ */
/* $NetBSD: ccd.c,v 1.113 2006/08/27 04:58:40 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999 The NetBSD Foundation, Inc.
@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.112 2006/07/21 16:48:47 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.113 2006/08/27 04:58:40 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -150,6 +150,7 @@ __KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.112 2006/07/21 16:48:47 ad Exp $");
#include <sys/kauth.h>
#include <dev/ccdvar.h>
#include <dev/dkvar.h>
#if defined(CCDDEBUG) && !defined(DEBUG)
#define DEBUG
@ -194,7 +195,6 @@ static void ccdinterleave(struct ccd_softc *);
static void ccdintr(struct ccd_softc *, struct buf *);
static int ccdinit(struct ccd_softc *, char **, struct vnode **,
struct lwp *);
static int ccdlookup(char *, struct lwp *, struct vnode **);
static struct ccdbuf *ccdbuffer(struct ccd_softc *, struct buf *,
daddr_t, caddr_t, long);
static void ccdgetdefaultlabel(struct ccd_softc *, struct disklabel *);
@ -1099,7 +1099,7 @@ ccdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
if (ccddebug & CCDB_INIT)
printf("ccdioctl: lookedup = %d\n", lookedup);
#endif
if ((error = ccdlookup(cpp[i], l, &vpp[i])) != 0) {
if ((error = dk_lookup(cpp[i], l, &vpp[i])) != 0) {
for (j = 0; j < lookedup; ++j)
(void)vn_close(vpp[j], FREAD|FWRITE,
uc, l);
@ -1353,62 +1353,6 @@ ccddump(dev_t dev, daddr_t blkno, caddr_t va, size_t size)
return ENXIO;
}
/*
* 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.
*/
static int
ccdlookup(char *path, struct lwp *l, struct vnode **vpp /* result */)
{
struct nameidata nd;
struct vnode *vp;
struct vattr va;
int error;
NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, path, l);
if ((error = vn_open(&nd, FREAD|FWRITE, 0)) != 0) {
#ifdef DEBUG
if (ccddebug & (CCDB_FOLLOW|CCDB_INIT))
printf("ccdlookup: vn_open error = %d\n", error);
#endif
return (error);
}
vp = nd.ni_vp;
if (vp->v_usecount > 1) {
VOP_UNLOCK(vp, 0);
(void)vn_close(vp, FREAD|FWRITE, l->l_cred, l);
return (EBUSY);
}
if ((error = VOP_GETATTR(vp, &va, l->l_cred, l)) != 0) {
#ifdef DEBUG
if (ccddebug & (CCDB_FOLLOW|CCDB_INIT))
printf("ccdlookup: getattr error = %d\n", error);
#endif
VOP_UNLOCK(vp, 0);
(void)vn_close(vp, FREAD|FWRITE, l->l_cred, l);
return (error);
}
/* XXX: eventually we should handle VREG, too. */
if (va.va_type != VBLK) {
VOP_UNLOCK(vp, 0);
(void)vn_close(vp, FREAD|FWRITE, l->l_cred, l);
return (ENOTBLK);
}
#ifdef DEBUG
if (ccddebug & CCDB_VNODE)
vprint("ccdlookup: vnode info", vp);
#endif
VOP_UNLOCK(vp, 0);
*vpp = vp;
return (0);
}
static void
ccdgetdefaultlabel(struct ccd_softc *cs, struct disklabel *lp)
{