diff options
| author | Sebastien Marie <semarie@cvs.openbsd.org> | 2021-10-20 06:35:41 +0000 |
|---|---|---|
| committer | Sebastien Marie <semarie@cvs.openbsd.org> | 2021-10-20 06:35:41 +0000 |
| commit | 47b23ec03efc1b932be87067956839394671386c (patch) | |
| tree | 64e1ac372911b2a73e19c4350ee6c1f982ab6c15 /sys/nfs | |
| parent | 16a20d6ce2c628aa63c5e43d8a3c1019425133c8 (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/nfs')
| -rw-r--r-- | sys/nfs/nfs_node.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/nfs/nfs_node.c b/sys/nfs/nfs_node.c index 1069ad597da..958d64378ec 100644 --- a/sys/nfs/nfs_node.c +++ b/sys/nfs/nfs_node.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_node.c,v 1.73 2021/10/19 06:26:09 semarie Exp $ */ +/* $OpenBSD: nfs_node.c,v 1.74 2021/10/20 06:35:39 semarie Exp $ */ /* $NetBSD: nfs_node.c,v 1.16 1996/02/18 11:53:42 fvdl Exp $ */ /* @@ -133,6 +133,9 @@ loop: } vp = nvp; +#ifdef VFSLCKDEBUG + vp->v_flag |= VLOCKSWORK; +#endif rrw_init_flags(&np->n_lock, "nfsnode", RWL_DUPOK | RWL_IS_VNODE); vp->v_data = np; /* we now have an nfsnode on this vnode */ |