diff options
| author | jhb <jhb@FreeBSD.org> | 2001-11-27 00:08:04 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2001-11-27 00:08:04 +0000 |
| commit | 0dc259caa3a844e61c9d534587882d56247ae8ef (patch) | |
| tree | 22503bbc49eb76546ebb1e51de8bf6b3149e6d91 /sys/fs/ntfs/ntfs_subr.c | |
| parent | b4d8ef062a6f58445415e781d6537581f1eb631f (diff) | |
| download | FreeBSD-src-0dc259caa3a844e61c9d534587882d56247ae8ef.zip FreeBSD-src-0dc259caa3a844e61c9d534587882d56247ae8ef.tar.gz | |
Expand LOCKMGR() compat macro.
Diffstat (limited to 'sys/fs/ntfs/ntfs_subr.c')
| -rw-r--r-- | sys/fs/ntfs/ntfs_subr.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/sys/fs/ntfs/ntfs_subr.c b/sys/fs/ntfs/ntfs_subr.c index 8f5f6a4..f14d741 100644 --- a/sys/fs/ntfs/ntfs_subr.c +++ b/sys/fs/ntfs/ntfs_subr.c @@ -355,7 +355,8 @@ ntfs_ntget(ip) mtx_lock(&ip->i_interlock); ip->i_usecount++; - LOCKMGR(&ip->i_lock, LK_EXCLUSIVE | LK_INTERLOCK, &ip->i_interlock); + lockmgr(&ip->i_lock, LK_EXCLUSIVE | LK_INTERLOCK, &ip->i_interlock, + NULL); return 0; } @@ -385,7 +386,8 @@ ntfs_ntlookup( *ipp = ip; return (0); } - } while (LOCKMGR(&ntfs_hashlock, LK_EXCLUSIVE | LK_SLEEPFAIL, NULL)); + } while (lockmgr(&ntfs_hashlock, LK_EXCLUSIVE | LK_SLEEPFAIL, NULL, + NULL)); MALLOC(ip, struct ntnode *, sizeof(struct ntnode), M_NTFSNTNODE, M_WAITOK | M_ZERO); @@ -407,7 +409,7 @@ ntfs_ntlookup( ntfs_nthashins(ip); - LOCKMGR(&ntfs_hashlock, LK_RELEASE, NULL); + lockmgr(&ntfs_hashlock, LK_RELEASE, NULL, NULL); *ipp = ip; @@ -443,7 +445,8 @@ ntfs_ntput(ip) #endif if (ip->i_usecount > 0) { - LOCKMGR(&ip->i_lock, LK_RELEASE|LK_INTERLOCK, &ip->i_interlock); + lockmgr(&ip->i_lock, LK_RELEASE|LK_INTERLOCK, &ip->i_interlock, + NULL); return; } @@ -1928,7 +1931,7 @@ ntfs_toupper_use(mp, ntmp) struct vnode *vp; /* get exclusive access */ - LOCKMGR(&ntfs_toupper_lock, LK_EXCLUSIVE, NULL); + lockmgr(&ntfs_toupper_lock, LK_EXCLUSIVE, NULL, NULL); /* only read the translation data from a file if it hasn't been * read already */ @@ -1951,7 +1954,7 @@ ntfs_toupper_use(mp, ntmp) out: ntfs_toupper_usecount++; - LOCKMGR(&ntfs_toupper_lock, LK_RELEASE, NULL); + lockmgr(&ntfs_toupper_lock, LK_RELEASE, NULL, NULL); return (error); } @@ -1963,7 +1966,7 @@ void ntfs_toupper_unuse() { /* get exclusive access */ - LOCKMGR(&ntfs_toupper_lock, LK_EXCLUSIVE, NULL); + lockmgr(&ntfs_toupper_lock, LK_EXCLUSIVE, NULL, NULL); ntfs_toupper_usecount--; if (ntfs_toupper_usecount == 0) { @@ -1978,7 +1981,7 @@ ntfs_toupper_unuse() #endif /* release the lock */ - LOCKMGR(&ntfs_toupper_lock, LK_RELEASE, NULL); + lockmgr(&ntfs_toupper_lock, LK_RELEASE, NULL, NULL); } int |
