Module Name: src
Committed By: riastradh
Date: Tue Apr 11 14:29:32 UTC 2017
Modified Files:
src/sys/kern: vnode_if.sh
src/sys/miscfs/genfs: genfs_vnops.c
src/sys/sys: vnode.h
Log Message:
Eliminate now-unused WILLUNLOCK vop flag.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/kern/vnode_if.sh
cvs rdiff -u -r1.194 -r1.195 src/sys/miscfs/genfs/genfs_vnops.c
cvs rdiff -u -r1.276 -r1.277 src/sys/sys/vnode.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vnode_if.sh
diff -u src/sys/kern/vnode_if.sh:1.62 src/sys/kern/vnode_if.sh:1.63
--- src/sys/kern/vnode_if.sh:1.62 Wed Feb 22 09:45:51 2017
+++ src/sys/kern/vnode_if.sh Tue Apr 11 14:29:32 2017
@@ -29,7 +29,7 @@ copyright="\
* SUCH DAMAGE.
*/
"
-SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.62 2017/02/22 09:45:51 hannken Exp $'
+SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.63 2017/04/11 14:29:32 riastradh Exp $'
# Script to produce VFS front-end sugar.
#
@@ -136,10 +136,6 @@ awk_parser='
$3 == "WILLRELE") {
willrele[argc] = 1;
i++;
- } else if ($2 == "WILLUNLOCK" ||
- $3 == "WILLUNLOCK") {
- willrele[argc] = 2;
- i++;
} else if ($2 == "WILLPUT" ||
$3 == "WILLPUT") {
willrele[argc] = 3;
@@ -368,9 +364,7 @@ function offsets() {
vpnum = 0;
for (i=0; i<argc; i++) {
if (willrele[i]) {
- if (willrele[i] == 2) {
- word = "UNLOCK";
- } else if (willrele[i] == 3) {
+ if (willrele[i] == 3) {
word = "PUT";
} else {
word = "RELE";
Index: src/sys/miscfs/genfs/genfs_vnops.c
diff -u src/sys/miscfs/genfs/genfs_vnops.c:1.194 src/sys/miscfs/genfs/genfs_vnops.c:1.195
--- src/sys/miscfs/genfs/genfs_vnops.c:1.194 Thu Mar 30 09:16:52 2017
+++ src/sys/miscfs/genfs/genfs_vnops.c Tue Apr 11 14:29:32 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_vnops.c,v 1.194 2017/03/30 09:16:52 hannken Exp $ */
+/* $NetBSD: genfs_vnops.c,v 1.195 2017/04/11 14:29:32 riastradh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.194 2017/03/30 09:16:52 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.195 2017/04/11 14:29:32 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -227,9 +227,6 @@ genfs_eopnotsupp(void *v)
vp_last = vp;
}
break;
- case VDESC_VP0_WILLUNLOCK:
- VOP_UNLOCK(vp);
- break;
case VDESC_VP0_WILLRELE:
vrele(vp);
break;
Index: src/sys/sys/vnode.h
diff -u src/sys/sys/vnode.h:1.276 src/sys/sys/vnode.h:1.277
--- src/sys/sys/vnode.h:1.276 Tue Apr 11 06:47:25 2017
+++ src/sys/sys/vnode.h Tue Apr 11 14:29:32 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: vnode.h,v 1.276 2017/04/11 06:47:25 riastradh Exp $ */
+/* $NetBSD: vnode.h,v 1.277 2017/04/11 14:29:32 riastradh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -379,10 +379,6 @@ extern unsigned int numvnodes; /* curren
#define VDESC_VP1_WILLRELE 0x00000002
#define VDESC_VP2_WILLRELE 0x00000004
#define VDESC_VP3_WILLRELE 0x00000008
-#define VDESC_VP0_WILLUNLOCK 0x00000100
-#define VDESC_VP1_WILLUNLOCK 0x00000200
-#define VDESC_VP2_WILLUNLOCK 0x00000400
-#define VDESC_VP3_WILLUNLOCK 0x00000800
#define VDESC_VP0_WILLPUT 0x00000101
#define VDESC_VP1_WILLPUT 0x00000202
#define VDESC_VP2_WILLPUT 0x00000404
