diff options
| author | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2007-03-21 17:29:33 +0000 |
|---|---|---|
| committer | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2007-03-21 17:29:33 +0000 |
| commit | d7075ee61fe295572ec5280319c9bf06d8efc05c (patch) | |
| tree | 7aa4feffdaa8971ae78c3297e75ec6ce90e3d16e /sys/miscfs | |
| parent | 9843bf83bf9e4de70eb9c525d77debf82b8e052d (diff) | |
Remove the v_interlock simplelock from the vnode structure.
Zap all calls to simple_lock/unlock() on it (those calls are
#defined away though). Remove the LK_INTERLOCK from the calls
to vn_lock() and cleanup the filesystems wich implement VOP_LOCK().
(by remvoing the v_interlock from there calls to lockmgr()).
ok pedro@, art@, tedu@
Diffstat (limited to 'sys/miscfs')
| -rw-r--r-- | sys/miscfs/deadfs/dead_vnops.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c index b91827115bc..0e511ad245a 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.15 2003/09/23 16:51:12 millert Exp $ */ +/* $OpenBSD: dead_vnops.c,v 1.16 2007/03/21 17:29:32 thib Exp $ */ /* $NetBSD: dead_vnops.c,v 1.16 1996/02/13 13:12:48 mycroft Exp $ */ /* @@ -279,16 +279,8 @@ dead_lock(v) } */ *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 (ap->a_flags & LK_DRAIN || !chkvnlock(vp)) - return (0); + return (0); return (VCALL(vp, VOFFSET(vop_lock), ap)); } |