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/isofs/cd9660 | |
| 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/isofs/cd9660')
| -rw-r--r-- | sys/isofs/cd9660/cd9660_node.c | 5 | ||||
| -rw-r--r-- | sys/isofs/cd9660/cd9660_vnops.c | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c index c538b32f378..e5ed56609ec 100644 --- a/sys/isofs/cd9660/cd9660_node.c +++ b/sys/isofs/cd9660/cd9660_node.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_node.c,v 1.16 2006/01/09 12:43:16 pedro Exp $ */ +/* $OpenBSD: cd9660_node.c,v 1.17 2007/03/21 17:29:31 thib Exp $ */ /* $NetBSD: cd9660_node.c,v 1.17 1997/05/05 07:13:57 mycroft Exp $ */ /*- @@ -163,9 +163,8 @@ loop: for (ip = isohashtbl[INOHASH(dev, inum)]; ip; ip = ip->i_next) { if (inum == ip->i_number && dev == ip->i_dev) { vp = ITOV(ip); - simple_lock(&vp->v_interlock); simple_unlock(&cd9660_ihash_slock); - if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, p)) + if (vget(vp, LK_EXCLUSIVE, p)) goto loop; return (vp); } diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c index 6502c58573e..6433dd131a7 100644 --- a/sys/isofs/cd9660/cd9660_vnops.c +++ b/sys/isofs/cd9660/cd9660_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_vnops.c,v 1.38 2007/01/16 17:52:18 thib Exp $ */ +/* $OpenBSD: cd9660_vnops.c,v 1.39 2007/03/21 17:29:31 thib Exp $ */ /* $NetBSD: cd9660_vnops.c,v 1.42 1997/10/16 23:56:57 christos Exp $ */ /*- @@ -880,7 +880,7 @@ cd9660_lock(v) } */ *ap = v; struct vnode *vp = ap->a_vp; - return (lockmgr(&VTOI(vp)->i_lock, ap->a_flags, &vp->v_interlock)); + return (lockmgr(&VTOI(vp)->i_lock, ap->a_flags, NULL)); } /* @@ -895,8 +895,7 @@ cd9660_unlock(v) } */ *ap = v; struct vnode *vp = ap->a_vp; - return (lockmgr(&VTOI(vp)->i_lock, ap->a_flags | LK_RELEASE, - &vp->v_interlock)); + return (lockmgr(&VTOI(vp)->i_lock, ap->a_flags | LK_RELEASE, NULL)); } /* |