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/hpfs | |
| parent | b4d8ef062a6f58445415e781d6537581f1eb631f (diff) | |
| download | FreeBSD-src-0dc259caa3a844e61c9d534587882d56247ae8ef.zip FreeBSD-src-0dc259caa3a844e61c9d534587882d56247ae8ef.tar.gz | |
Expand LOCKMGR() compat macro.
Diffstat (limited to 'sys/fs/hpfs')
| -rw-r--r-- | sys/fs/hpfs/hpfs.h | 1 | ||||
| -rw-r--r-- | sys/fs/hpfs/hpfs_hash.c | 3 | ||||
| -rw-r--r-- | sys/fs/hpfs/hpfs_subr.h | 4 | ||||
| -rw-r--r-- | sys/fs/hpfs/hpfs_vfsops.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sys/fs/hpfs/hpfs.h b/sys/fs/hpfs/hpfs.h index f880715..e1e8c0c 100644 --- a/sys/fs/hpfs/hpfs.h +++ b/sys/fs/hpfs/hpfs.h @@ -391,7 +391,6 @@ MALLOC_DECLARE(M_HPFSNO); #define VOP__UNLOCK(a, b, c) VOP_UNLOCK((a), (b), (c)) #define VGET(a, b, c) vget((a), (b), (c)) #define VN_LOCK(a, b, c) vn_lock((a), (b), (c)) -#define LOCKMGR(a, b, c, d) lockmgr((a), (b), (c), (d)) extern vop_t ** hpfs_vnodeop_p; diff --git a/sys/fs/hpfs/hpfs_hash.c b/sys/fs/hpfs/hpfs_hash.c index fd8eeca..5cc79cc 100644 --- a/sys/fs/hpfs/hpfs_hash.c +++ b/sys/fs/hpfs/hpfs_hash.c @@ -113,7 +113,8 @@ loop: mtx_lock(&hpfs_hphash_mtx); LIST_FOREACH(hp, HPNOHASH(dev, ino), h_hash) { if (ino == hp->h_no && dev == hp->h_dev) { - LOCKMGR(&hp->h_intlock, LK_EXCLUSIVE | LK_INTERLOCK, &hpfs_hphash_slock, NULL); + lockmgr(&hp->h_intlock, LK_EXCLUSIVE | LK_INTERLOCK, + &hpfs_hphash_slock, NULL); return (hp); } } diff --git a/sys/fs/hpfs/hpfs_subr.h b/sys/fs/hpfs/hpfs_subr.h index 46d2f41..9409152 100644 --- a/sys/fs/hpfs/hpfs_subr.h +++ b/sys/fs/hpfs/hpfs_subr.h @@ -78,8 +78,8 @@ int hpfs_breadstruct (struct hpfsmount *, lsn_t, u_int, u_int32_t, hpfs_breadstruct(hpmp, lsn, D_BSIZE, D_MAGIC, bpp) #if 0 -#define hpfs_hplock(hp, p) LOCKMGR(&(hp)->h_intlock, LK_EXCLUSIVE, (p)) -#define hpfs_hpunlock(hp, p) LOCKMGR(&(hp)->h_intlock, LK_RELEASE, (p)) +#define hpfs_hplock(hp, p) lockmgr(&(hp)->h_intlock, LK_EXCLUSIVE, (p), NULL) +#define hpfs_hpunlock(hp, p) lockmgr(&(hp)->h_intlock, LK_RELEASE, (p), NULL) #endif int hpfs_hpbmap (struct hpfsnode *, daddr_t, daddr_t *, int *); diff --git a/sys/fs/hpfs/hpfs_vfsops.c b/sys/fs/hpfs/hpfs_vfsops.c index 3829b85..6b95174 100644 --- a/sys/fs/hpfs/hpfs_vfsops.c +++ b/sys/fs/hpfs/hpfs_vfsops.c @@ -536,11 +536,11 @@ hpfs_vget( vput(vp); return (0); } - } while(LOCKMGR(&hpfs_hphash_lock,LK_EXCLUSIVE|LK_SLEEPFAIL,NULL,NULL)); + } while(lockmgr(&hpfs_hphash_lock,LK_EXCLUSIVE|LK_SLEEPFAIL,NULL,NULL)); hpfs_hphashins(hp); - LOCKMGR(&hpfs_hphash_lock, LK_RELEASE, NULL, NULL); + lockmgr(&hpfs_hphash_lock, LK_RELEASE, NULL, NULL); error = bread(hpmp->hpm_devvp, ino, FNODESIZE, NOCRED, &bp); if (error) { |
