summaryrefslogtreecommitdiff
path: root/sys/ntfs/ntfs_vfsops.c
diff options
context:
space:
mode:
authorMartin Natano <natano@cvs.openbsd.org>2016-06-19 11:54:35 +0000
committerMartin Natano <natano@cvs.openbsd.org>2016-06-19 11:54:35 +0000
commitb70123aec90044d17f9882033c3f3ac7a1fb78f6 (patch)
tree84f74dc221b666238a94c4435ab5d31c75d67428 /sys/ntfs/ntfs_vfsops.c
parentdf2ea89c9faeef8fb93ba702e7841560708f8a61 (diff)
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/ntfs/ntfs_vfsops.c')
-rw-r--r--sys/ntfs/ntfs_vfsops.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/ntfs/ntfs_vfsops.c b/sys/ntfs/ntfs_vfsops.c
index fedc49d3983..bae57b58da8 100644
--- a/sys/ntfs/ntfs_vfsops.c
+++ b/sys/ntfs/ntfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ntfs_vfsops.c,v 1.51 2016/05/22 20:27:04 bluhm Exp $ */
+/* $OpenBSD: ntfs_vfsops.c,v 1.52 2016/06/19 11:54:33 natano Exp $ */
/* $NetBSD: ntfs_vfsops.c,v 1.7 2003/04/24 07:50:19 christos Exp $ */
/*-
@@ -522,7 +522,7 @@ ntfs_unmount(struct mount *mp, int mntflags, struct proc *p)
ntmp->ntm_devvp->v_specmountpoint = NULL;
/* lock the device vnode before calling VOP_CLOSE() */
- VOP_LOCK(ntmp->ntm_devvp, LK_EXCLUSIVE | LK_RETRY, p);
+ vn_lock(ntmp->ntm_devvp, LK_EXCLUSIVE | LK_RETRY, p);
vinvalbuf(ntmp->ntm_devvp, V_SAVE, NOCRED, p, 0, 0);
(void)VOP_CLOSE(ntmp->ntm_devvp, ronly ? FREAD : FREAD|FWRITE,
NOCRED, p);