summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvisa <visa@openbsd.org>2019-10-19 06:56:18 +0000
committervisa <visa@openbsd.org>2019-10-19 06:56:18 +0000
commited1efb5717e6cf177427e62bf44e50adaeab3a4c (patch)
tree67880d32511c47267a62561cc1aa9800ab5db435
parentDon't check that the ipv6 source address of a neighbor advertisment is (diff)
downloadwireguard-openbsd-ed1efb5717e6cf177427e62bf44e50adaeab3a4c.tar.xz
wireguard-openbsd-ed1efb5717e6cf177427e62bf44e50adaeab3a4c.zip
Unlock the vnode in vop_inactive of deadfs. The unlock operation is
a no-op at the moment, but future work will introduce an actual lock that has to be released. OK mpi@ anton@
-rw-r--r--sys/miscfs/deadfs/dead_vnops.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c
index bbbb8eedf88..d4f523bfd72 100644
--- a/sys/miscfs/deadfs/dead_vnops.c
+++ b/sys/miscfs/deadfs/dead_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dead_vnops.c,v 1.29 2015/03/14 03:38:51 jsg Exp $ */
+/* $OpenBSD: dead_vnops.c,v 1.30 2019/10/19 06:56:18 visa Exp $ */
/* $NetBSD: dead_vnops.c,v 1.16 1996/02/13 13:12:48 mycroft Exp $ */
/*
@@ -52,6 +52,7 @@ int dead_read(void *);
int dead_write(void *);
int dead_ioctl(void *);
int dead_poll(void *);
+int dead_inactive(void *);
int dead_lock(void *);
int dead_bmap(void *);
int dead_strategy(void *);
@@ -82,7 +83,7 @@ struct vops dead_vops = {
.vop_readdir = dead_ebadf,
.vop_readlink = dead_ebadf,
.vop_abortop = dead_badop,
- .vop_inactive = nullop,
+ .vop_inactive = dead_inactive,
.vop_reclaim = nullop,
.vop_lock = dead_lock,
.vop_unlock = vop_generic_unlock,
@@ -185,6 +186,15 @@ dead_strategy(void *v)
return (VOP_STRATEGY(ap->a_bp));
}
+int
+dead_inactive(void *v)
+{
+ struct vop_inactive_args *ap = v;
+
+ VOP_UNLOCK(ap->a_vp);
+ return (0);
+}
+
/*
* Wait until the vnode has finished changing state.
*/