diff options
| author |   deraadt <deraadt@openbsd.org> | 1997-10-06 20:19:26 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 1997-10-06 20:19:26 +0000 |
| commit | f6d35f956ac60c4dbcc91b018b2bcefd71ad933f (patch) | |
| tree | 918af077b7c363fb7d19243c4ecb7f0165b3bc65 /sys/msdosfs/msdosfs_denode.c | |
| parent | Build generic and genericsbc kernels into snapshot and distribute them (diff) | |
| download | wireguard-openbsd-f6d35f956ac60c4dbcc91b018b2bcefd71ad933f.tar.xz wireguard-openbsd-f6d35f956ac60c4dbcc91b018b2bcefd71ad933f.zip | |
back out vfs lite2 till after 2.2
Diffstat (limited to 'sys/msdosfs/msdosfs_denode.c')
| -rw-r--r-- | sys/msdosfs/msdosfs_denode.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c index 258e5632c71..0debd66175d 100644 --- a/sys/msdosfs/msdosfs_denode.c +++ b/sys/msdosfs/msdosfs_denode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfs_denode.c,v 1.6 1997/10/06 15:22:38 csapuntz Exp $ */ +/* $OpenBSD: msdosfs_denode.c,v 1.7 1997/10/06 20:20:57 deraadt Exp $ */ /* $NetBSD: msdosfs_denode.c,v 1.22 1996/10/13 04:16:31 christos Exp $ */ /*- @@ -76,13 +76,10 @@ static struct denode *msdosfs_hashget __P((dev_t, u_long, u_long)); static void msdosfs_hashins __P((struct denode *)); static void msdosfs_hashrem __P((struct denode *)); -/*ARGSUSED*/ -int -msdosfs_init(vfsp) - struct vfsconf *vfsp; +void +msdosfs_init() { dehashtbl = hashinit(desiredvnodes/2, M_MSDOSFSMNT, &dehash); - return (0); } static struct denode * @@ -92,8 +89,7 @@ msdosfs_hashget(dev, dirclust, diroff) u_long diroff; { struct denode *dep; - struct proc *p = curproc; /* XXX */ - + for (;;) for (dep = dehashtbl[DEHASH(dev, dirclust, diroff)];; dep = dep->de_next) { @@ -108,7 +104,7 @@ msdosfs_hashget(dev, dirclust, diroff) sleep(dep, PINOD); break; } - if (!vget(DETOV(dep), LK_EXCLUSIVE, p)) + if (!vget(DETOV(dep), 1)) return (dep); break; } @@ -170,7 +166,6 @@ deget(pmp, dirclust, diroffset, depp) struct denode *ldep; struct vnode *nvp; struct buf *bp; - struct proc *p = curproc; /* XXX */ #ifdef MSDOSFS_DEBUG printf("deget(pmp %08x, dirclust %d, diroffset %x, depp %08x)\n", @@ -223,7 +218,7 @@ deget(pmp, dirclust, diroffset, depp) * can't be accessed until we've read it in and have done what we * need to it. */ - vn_lock(nvp, LK_EXCLUSIVE | LK_RETRY, p); + VOP_LOCK(nvp); msdosfs_hashins(ldep); /* @@ -567,11 +562,9 @@ msdosfs_inactive(v) { struct vop_inactive_args /* { struct vnode *a_vp; - struct proc *a_p; } */ *ap = v; struct vnode *vp = ap->a_vp; struct denode *dep = VTODE(vp); - struct proc *p = ap->a_p; int error; extern int prtactive; @@ -615,7 +608,7 @@ msdosfs_inactive(v) dep->de_Name[0] = SLOT_DELETED; } deupdat(dep, 0); - VOP_UNLOCK(vp, 0, p); + VOP_UNLOCK(vp); /* * If we are done with the denode, reclaim it * so that it can be reused immediately. |