diff options
| author |   natano <natano@openbsd.org> | 2016-06-19 11:54:33 +0000 |
|---|---|---|
| committer | natano <natano@openbsd.org> | 2016-06-19 11:54:33 +0000 |
| commit | 26b8ec940ab2fa67fbd6a540475975a33d306550 (patch) | |
| tree | 4bc38369f07e2cfc6049ba8975ecac48a7e6367b /sys/msdosfs/msdosfs_vnops.c | |
| parent | sync (diff) | |
| download | wireguard-openbsd-26b8ec940ab2fa67fbd6a540475975a33d306550.tar.xz wireguard-openbsd-26b8ec940ab2fa67fbd6a540475975a33d306550.zip | |
Remove the lockmgr() API. It is only used by filesystems, where it is a
trivial change to use rrw locks instead. All it needs is LK_* defines
for the RW_* flags.
tested by naddy and sthen on package building infrastructure
input and ok jmc mpi tedu
Diffstat (limited to 'sys/msdosfs/msdosfs_vnops.c')
| -rw-r--r-- | sys/msdosfs/msdosfs_vnops.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c index b681887a31f..45a479fb646 100644 --- a/sys/msdosfs/msdosfs_vnops.c +++ b/sys/msdosfs/msdosfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfs_vnops.c,v 1.111 2016/05/21 18:11:36 natano Exp $ */ +/* $OpenBSD: msdosfs_vnops.c,v 1.112 2016/06/19 11:54:33 natano Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.63 1997/10/17 11:24:19 ws Exp $ */ /*- @@ -1721,7 +1721,7 @@ msdosfs_lock(void *v) struct vop_lock_args *ap = v; struct vnode *vp = ap->a_vp; - return (lockmgr(&VTODE(vp)->de_lock, ap->a_flags, NULL)); + return rrw_enter(&VTODE(vp)->de_lock, ap->a_flags & LK_RWFLAGS); } int @@ -1730,7 +1730,8 @@ msdosfs_unlock(void *v) struct vop_unlock_args *ap = v; struct vnode *vp = ap->a_vp; - return (lockmgr(&VTODE(vp)->de_lock, LK_RELEASE, NULL)); + rrw_exit(&VTODE(vp)->de_lock); + return 0; } int @@ -1738,7 +1739,7 @@ msdosfs_islocked(void *v) { struct vop_islocked_args *ap = v; - return (lockstatus(&VTODE(ap->a_vp)->de_lock)); + return rrw_status(&VTODE(ap->a_vp)->de_lock); } /* |