 @@ -19,49 +19,52 @@ copyright="\
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS \`\`AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+"
-SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.51 2008/11/19 14:10:49 pooka Exp $'
+SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.52 2009/09/29 11:51:02 pooka Exp $'
 # Script to produce VFS front-end sugar.
+#
 # usage: vnode_if.sh srcfile
 #	(where srcfile is currently /sys/kern/vnode_if.src)
+#
 if [ $# -ne 1 ] ; then
 	echo 'usage: vnode_if.sh srcfile'
 	exit 1
 fi
 # Name and revision of the source file.
 src=$1
 SRC_ID=`head -1 $src | sed -e 's/.*\$\(.*\)\$.*/\1/'`
 # Names of the created files.
 out_c=vnode_if.c
 out_rumpc=../rump/librump/rumpvfs/rumpvnode_if.c
 out_h=../sys/vnode_if.h
 out_rumph=../rump/include/rump/rumpvnode_if.h
 # generate VNODE_LOCKDEBUG checks (not fully functional)
 lockdebug=0
 # Awk program (must support nawk extensions)
 # Use "awk" at Berkeley, "nawk" or "gawk" elsewhere.
 awk=${AWK:-awk}
 # Does this awk have a "toupper" function? (i.e. is it GNU awk)
 isgawk=`$awk 'BEGIN { print toupper("true"); exit; }' 2>/dev/null`
 # If this awk does not define "toupper" then define our own.
 if [ "$isgawk" = TRUE ] ; then
 	# GNU awk provides it.
 	toupper=
 else
 	# Provide our own toupper()
 @@ -186,30 +189,32 @@ rump=$2
 # Begin stuff
 if [ -z "${rump}" ]; then
 	SYS='SYS_'
 else
 	SYS='RUMP_RUMP'
 fi
 echo -n "$warning" | sed -e 's/\$//g;s/@/\$/g;s/ $//'
 echo ""
 echo -n "$copyright"
 echo ''
 echo "#ifndef _${SYS}VNODE_IF_H_"
 echo "#define _${SYS}VNODE_IF_H_"
-echo ''
+if [ ${lockdebug} -ne 0 ] ; then
-echo '#ifdef _KERNEL_OPT'
+	echo ''
-echo '#include "opt_vnode_lockdebug.h"'
+	echo '#ifdef _KERNEL_OPT'
-echo '#endif /* _KERNEL_OPT */'
+	echo '#include "opt_vnode_lockdebug.h"'
 	echo '#endif /* _KERNEL_OPT */'
 fi
 echo "
 extern const struct vnodeop_desc ${rump}vop_default_desc;
+"
 # Body stuff
 # This awk program needs toupper() so define it if necessary.
 sed -e "$sed_prep" $src | $awk -v rump=${rump} "$toupper"'
 function doit() {
 	# Declare arg struct, descriptor.
 	printf("\n#define %s_DESCOFFSET %d\n", toupper(name), vop_offset++);
 	printf("struct %s_args {\n", name);
 	printf("\tconst struct vnodeop_desc * a_desc;\n");
 	for (i=0; i<argc; i++) {
 @@ -269,54 +274,53 @@ do_cfile () {
+#
 # Redirect stdout to the C file.
+#
 echo "$0: Creating $1" 1>&2
 exec > $1
 rump=$2
 # Begin stuff
 echo -n "$warning" | sed -e 's/\$//g;s/@/\$/g;s/ $//'
 echo ""
 echo -n "$copyright"
 echo "
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, \"\$NetBSD\$\");
+__KERNEL_RCSID(0, \"\$NetBSD\$\");"
 [ ${lockdebug} -ne 0 ] && echo && echo '#include "opt_vnode_lockdebug.h"'
 echo '
 #include "opt_vnode_lockdebug.h"'
 echo '
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
 #include <sys/lock.h>'
 [ ! -z "${rump}" ] && echo '#include <rump/rumpvnode_if.h>'
 echo "
 const struct vnodeop_desc ${rump}vop_default_desc = {"
 echo '	0,
 	"default",
 ,
 	NULL,
 	VDESC_NO_OFFSET,
 	VDESC_NO_OFFSET,
 	VDESC_NO_OFFSET,
 	NULL,
 };
+'
 # Body stuff
-sed -e "$sed_prep" $src | $awk -v rump=${rump} '
+sed -e "$sed_prep" $src | $awk -v rump=${rump} -v lockdebug=${lockdebug} '
 function do_offset(typematch) {
 	for (i=0; i<argc; i++) {
 		if (argtype[i] == typematch) {
 			printf("\tVOPARG_OFFSETOF(struct %s_args, a_%s),\n",
 				name, argname[i]);
 			return i;
 		};
 	};
 	print "\tVDESC_NO_OFFSET,";
 	return -1;
+}
 function doit() {
 @@ -366,36 +370,38 @@ function doit() {
 	# componentname
 	do_offset("struct componentname *");
 	# transport layer information
 	printf ("\tNULL,\n};\n");
 	# Define function.
 	printf("int\n%s(", toupper(name));
 	for (i=0; i<argc; i++) {
 		printf("%s %s", argtype[i], argname[i]);
 		if (i < (argc-1)) printf(",\n    ");
+	}
 	printf(")\n");
 	printf("{\n\tint error;\n\tbool mpsafe;\n\tstruct %s_args a;\n", name);
-	printf("#ifdef VNODE_LOCKDEBUG\n");
+	if (lockdebug) {
-	for (i=0; i<argc; i++) {
+		printf("#ifdef VNODE_LOCKDEBUG\n");
-		if (lockstate[i] != -1)
+		for (i=0; i<argc; i++) {
-			printf("\tint islocked_%s;\n", argname[i]);
+			if (lockstate[i] != -1)
 				printf("\tint islocked_%s;\n", argname[i]);
+		}
 		printf("#endif\n");
+	}
 	printf("#endif\n");
 	printf("\ta.a_desc = VDESC(%s);\n", name);
 	for (i=0; i<argc; i++) {
 		printf("\ta.a_%s = %s;\n", argname[i], argname[i]);
-		if (lockstate[i] != -1) {
+		if (lockdebug && lockstate[i] != -1) {
 			printf("#ifdef VNODE_LOCKDEBUG\n");
 			printf("\tislocked_%s = (%s->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(%s) == LK_EXCLUSIVE) : %d;\n",
 			    argname[i], argname[i], argname[i], lockstate[i]);
 			printf("\tif (islocked_%s != %d)\n", argname[i],
 			    lockstate[i]);
 			printf("\t\tpanic(\"%s: %s: locked %%d, expected %%d\", islocked_%s, %d);\n", name, argname[i], argname[i], lockstate[i]);
 			printf("#endif\n");
+		}
+	}
 	printf("\tmpsafe = (%s%s->v_vflag & VV_MPSAFE);\n", argname[0], arg0special);
 	printf("\tif (!mpsafe) { KERNEL_LOCK(1, curlwp); }\n");
 	printf("\terror = (VCALL(%s%s, VOFFSET(%s), &a));\n",
 		argname[0], arg0special, name);