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/adosfs | |
| 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/adosfs')
| -rw-r--r-- | sys/adosfs/adutil.c | 3 | ||||
| -rw-r--r-- | sys/adosfs/advnops.c | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/adosfs/adutil.c b/sys/adosfs/adutil.c index 0b3cc2cf4bf..70c0130d282 100644 --- a/sys/adosfs/adutil.c +++ b/sys/adosfs/adutil.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adutil.c,v 1.15 2005/11/19 02:18:00 pedro Exp $ */ +/* $OpenBSD: adutil.c,v 1.16 2007/03/21 17:29:31 thib Exp $ */ /* $NetBSD: adutil.c,v 1.15 1996/10/13 02:52:07 christos Exp $ */ /* @@ -71,7 +71,6 @@ adosfs_ahashget(mp, an) return (NULL); if (ABLKTOINO(ap->block) == an) { vp = ATOV(ap); - simple_lock(&vp->v_interlock); if (!vget(vp, LK_EXCLUSIVE, p)) return (vp); break; diff --git a/sys/adosfs/advnops.c b/sys/adosfs/advnops.c index 897e931cc61..a679704ca2f 100644 --- a/sys/adosfs/advnops.c +++ b/sys/adosfs/advnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: advnops.c,v 1.33 2007/01/16 17:52:18 thib Exp $ */ +/* $OpenBSD: advnops.c,v 1.34 2007/03/21 17:29:31 thib Exp $ */ /* $NetBSD: advnops.c,v 1.32 1996/10/13 02:52:09 christos Exp $ */ /* @@ -499,7 +499,7 @@ adosfs_lock(v) advopprint(ap); #endif - rv = lockmgr(&VTOA(vp)->a_lock, ap->a_flags, &vp->v_interlock); + rv = lockmgr(&VTOA(vp)->a_lock, ap->a_flags, NULL); #ifdef ADOSFS_DIAGNOSTIC printf(" %d)", rv); @@ -524,8 +524,7 @@ adosfs_unlock(v) advopprint(ap); #endif - rv = lockmgr(&VTOA(vp)->a_lock, ap->a_flags | LK_RELEASE, - &vp->v_interlock); + rv = lockmgr(&VTOA(vp)->a_lock, ap->a_flags | LK_RELEASE, NULL); #ifdef ADOSFS_DIAGNOSTIC printf(" %d)", rv); |