diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-10-06 20:23:17 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-10-06 20:23:17 +0000 |
| commit | 85674180ac0b414993bec634994ea51b28390306 (patch) | |
| tree | 5ce384dfed739e368b8605fc6db4ed1f26a43609 /sys/miscfs/deadfs | |
| parent | 44f83f3e77b70fbce9f014e39cf5c97bae700213 (diff) | |
back out vfs lite2 till after 2.2
Diffstat (limited to 'sys/miscfs/deadfs')
| -rw-r--r-- | sys/miscfs/deadfs/dead_vnops.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c index e1a6ffc0493..8004672c5fb 100644 --- a/sys/miscfs/deadfs/dead_vnops.c +++ b/sys/miscfs/deadfs/dead_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dead_vnops.c,v 1.3 1997/10/06 15:18:59 csapuntz Exp $ */ +/* $OpenBSD: dead_vnops.c,v 1.4 1997/10/06 20:20:20 deraadt Exp $ */ /* $NetBSD: dead_vnops.c,v 1.16 1996/02/13 13:12:48 mycroft Exp $ */ /* @@ -78,11 +78,11 @@ int dead_select __P((void *)); #define dead_inactive nullop #define dead_reclaim nullop int dead_lock __P((void *)); -#define dead_unlock vop_nounlock +#define dead_unlock nullop int dead_bmap __P((void *)); int dead_strategy __P((void *)); int dead_print __P((void *)); -#define dead_islocked vop_noislocked +#define dead_islocked nullop #define dead_pathconf dead_ebadf #define dead_advlock dead_ebadf #define dead_blkatoff dead_badop @@ -279,23 +279,11 @@ dead_lock(v) { struct vop_lock_args /* { struct vnode *a_vp; - int a_flags; - struct proc *a_p; } */ *ap = v; - struct vnode *vp = ap->a_vp; - - /* - * Since we are not using the lock manager, we must clear - * the interlock here. - */ - if (ap->a_flags & LK_INTERLOCK) { - simple_unlock(&vp->v_interlock); - ap->a_flags &= ~LK_INTERLOCK; - } - if (!chkvnlock(vp)) - return (0); - return (VCALL(vp, VOFFSET(vop_lock), ap)); + if (!chkvnlock(ap->a_vp)) + return (0); + return (VCALL(ap->a_vp, VOFFSET(vop_lock), ap)); } /* |