diff options
| author |   thib <thib@openbsd.org> | 2007-04-12 22:02:57 +0000 |
|---|---|---|
| committer | thib <thib@openbsd.org> | 2007-04-12 22:02:57 +0000 |
| commit | 594c3bef40a869ff37f17445b9723ea4e3c3cd5b (patch) | |
| tree | 7b742193a290ae4d0a65021fc03993012c884d8e | |
| parent | Allow machine-dependant overrides for the ``deadbeef'' sentinel values, (diff) | |
| download | wireguard-openbsd-594c3bef40a869ff37f17445b9723ea4e3c3cd5b.tar.xz wireguard-openbsd-594c3bef40a869ff37f17445b9723ea4e3c3cd5b.zip | |
Remove the i_interlock simplelock from struct ntnode
| -rw-r--r-- | sys/ntfs/ntfs_inode.h | 3 | ||||
| -rw-r--r-- | sys/ntfs/ntfs_subr.c | 13 |
2 files changed, 4 insertions, 12 deletions
diff --git a/sys/ntfs/ntfs_inode.h b/sys/ntfs/ntfs_inode.h index 0ef54d38f46..63060e1d203 100644 --- a/sys/ntfs/ntfs_inode.h +++ b/sys/ntfs/ntfs_inode.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ntfs_inode.h,v 1.2 2003/05/20 03:23:12 mickey Exp $ */ +/* $OpenBSD: ntfs_inode.h,v 1.3 2007/04/12 22:02:57 thib Exp $ */ /* $NetBSD: ntfs_inode.h,v 1.1 2002/12/23 17:38:33 jdolecek Exp $ */ /*- @@ -74,7 +74,6 @@ struct ntnode { /* locking */ struct lock i_lock; - struct simplelock i_interlock; int i_usecount; LIST_HEAD(,fnode) i_fnlist; diff --git a/sys/ntfs/ntfs_subr.c b/sys/ntfs/ntfs_subr.c index f5f233ef658..1d56edd30f8 100644 --- a/sys/ntfs/ntfs_subr.c +++ b/sys/ntfs/ntfs_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ntfs_subr.c,v 1.9 2006/03/05 21:48:57 miod Exp $ */ +/* $OpenBSD: ntfs_subr.c,v 1.10 2007/04/12 22:02:57 thib Exp $ */ /* $NetBSD: ntfs_subr.c,v 1.4 2003/04/10 21:37:32 jdolecek Exp $ */ /*- @@ -392,10 +392,9 @@ ntfs_ntget( dprintf(("ntfs_ntget: get ntnode %d: %p, usecount: %d\n", ip->i_number, ip, ip->i_usecount)); - simple_lock(&ip->i_interlock); ip->i_usecount++; - lockmgr(&ip->i_lock, LK_EXCLUSIVE | LK_INTERLOCK, &ip->i_interlock); + lockmgr(&ip->i_lock, LK_EXCLUSIVE, NULL); return 0; } @@ -452,7 +451,6 @@ ntfs_ntlookup( /* init lock and lock the newborn ntnode */ lockinit(&ip->i_lock, PINOD, "ntnode", 0, LK_EXCLUSIVE); - simple_lock_init(&ip->i_interlock); #ifndef __OpenBSD__ ntfs_ntget(ip); #else @@ -490,7 +488,6 @@ ntfs_ntput( dprintf(("ntfs_ntput: rele ntnode %d: %p, usecount: %d\n", ip->i_number, ip, ip->i_usecount)); - simple_lock(&ip->i_interlock); ip->i_usecount--; #ifdef DIAGNOSTIC @@ -501,7 +498,7 @@ ntfs_ntput( #endif if (ip->i_usecount > 0) { - lockmgr(&ip->i_lock, LK_RELEASE|LK_INTERLOCK, &ip->i_interlock); + lockmgr(&ip->i_lock, LK_RELEASE, NULL); return; } @@ -528,9 +525,7 @@ void ntfs_ntref(ip) struct ntnode *ip; { - simple_lock(&ip->i_interlock); ip->i_usecount++; - simple_unlock(&ip->i_interlock); dprintf(("ntfs_ntref: ino %d, usecount: %d\n", ip->i_number, ip->i_usecount)); @@ -547,13 +542,11 @@ ntfs_ntrele(ip) dprintf(("ntfs_ntrele: rele ntnode %d: %p, usecount: %d\n", ip->i_number, ip, ip->i_usecount)); - simple_lock(&ip->i_interlock); ip->i_usecount--; if (ip->i_usecount < 0) panic("ntfs_ntrele: ino: %d usecount: %d ", ip->i_number,ip->i_usecount); - simple_unlock(&ip->i_interlock); } /* |