summaryrefslogtreecommitdiff
path: root/sys/uvm
diff options
context:
space:
mode:
authorSebastien Marie <semarie@cvs.openbsd.org>2021-10-20 06:35:41 +0000
committerSebastien Marie <semarie@cvs.openbsd.org>2021-10-20 06:35:41 +0000
commit47b23ec03efc1b932be87067956839394671386c (patch)
tree64e1ac372911b2a73e19c4350ee6c1f982ab6c15 /sys/uvm
parent16a20d6ce2c628aa63c5e43d8a3c1019425133c8 (diff)
revert vnode: remove VLOCKSWORK and check locking when vop_islocked != nullop
(both kernel and userland bits) GENERIC + VFSLCKDEBUG is broken with it.
Diffstat (limited to 'sys/uvm')
-rw-r--r--sys/uvm/uvm_vnode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/uvm/uvm_vnode.c b/sys/uvm/uvm_vnode.c
index b97edd59dad..7d5984403bf 100644
--- a/sys/uvm/uvm_vnode.c
+++ b/sys/uvm/uvm_vnode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_vnode.c,v 1.117 2021/10/19 06:26:09 semarie Exp $ */
+/* $OpenBSD: uvm_vnode.c,v 1.118 2021/10/20 06:35:40 semarie Exp $ */
/* $NetBSD: uvm_vnode.c,v 1.36 2000/11/24 20:34:01 chs Exp $ */
/*
@@ -1328,7 +1328,7 @@ uvm_vnp_uncache(struct vnode *vp)
* carry over sanity check from old vnode pager: the vnode should
* be VOP_LOCK'd, and we confirm it here.
*/
- if ((vp->v_op->vop_islocked != nullop) && !VOP_ISLOCKED(vp))
+ if ((vp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(vp))
panic("uvm_vnp_uncache: vnode not locked!");
#endif