Module Name: src
Committed By: pooka
Date: Tue Sep 29 11:54:53 UTC 2009
Modified Files:
src/sys/kern: vnode_if.c
src/sys/rump/include/rump: rumpvnode_if.h
src/sys/rump/librump/rumpvfs: rumpvnode_if.c
src/sys/sys: vnode_if.h
Log Message:
regen: remove VNODE_LOCKDEBUG
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/kern/vnode_if.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/include/rump/rumpvnode_if.h
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/librump/rumpvfs/rumpvnode_if.c
cvs rdiff -u -r1.74 -r1.75 src/sys/sys/vnode_if.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.c
diff -u src/sys/kern/vnode_if.c:1.80 src/sys/kern/vnode_if.c:1.81
--- src/sys/kern/vnode_if.c:1.80 Mon Nov 17 08:59:33 2008
+++ src/sys/kern/vnode_if.c Tue Sep 29 11:54:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vnode_if.c,v 1.80 2008/11/17 08:59:33 pooka Exp $ */
+/* $NetBSD: vnode_if.c,v 1.81 2009/09/29 11:54:52 pooka Exp $ */
/*
* Warning: DO NOT EDIT! This file is automatically generated!
@@ -7,7 +7,7 @@
* Created from the file:
* NetBSD: vnode_if.src,v 1.58 2008/11/15 19:08:12 pooka Exp
* by the script:
- * NetBSD: vnode_if.sh,v 1.50 2008/11/17 08:46:03 pooka Exp
+ * NetBSD: vnode_if.sh,v 1.52 2009/09/29 11:51:02 pooka Exp
*/
/*
@@ -40,10 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.80 2008/11/17 08:59:33 pooka Exp $");
-
-
-#include "opt_vnode_lockdebug.h"
+__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.81 2009/09/29 11:54:52 pooka Exp $");
#include <sys/param.h>
#include <sys/mount.h>
@@ -84,8 +81,6 @@
int error;
bool mpsafe;
struct vop_bwrite_args a;
-#ifdef VNODE_LOCKDEBUG
-#endif
a.a_desc = VDESC(vop_bwrite);
a.a_bp = bp;
mpsafe = (bp->b_vp->v_vflag & VV_MPSAFE);
@@ -119,8 +114,6 @@
int error;
bool mpsafe;
struct vop_lookup_args a;
-#ifdef VNODE_LOCKDEBUG
-#endif
a.a_desc = VDESC(vop_lookup);
a.a_dvp = dvp;
a.a_vpp = vpp;
@@ -160,16 +153,8 @@
int error;
bool mpsafe;
struct vop_create_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_dvp;
-#endif
a.a_desc = VDESC(vop_create);
a.a_dvp = dvp;
-#ifdef VNODE_LOCKDEBUG
- islocked_dvp = (dvp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(dvp) == LK_EXCLUSIVE) : 1;
- if (islocked_dvp != 1)
- panic("vop_create: dvp: locked %d, expected %d", islocked_dvp, 1);
-#endif
a.a_vpp = vpp;
a.a_cnp = cnp;
a.a_vap = vap;
@@ -208,16 +193,8 @@
int error;
bool mpsafe;
struct vop_mknod_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_dvp;
-#endif
a.a_desc = VDESC(vop_mknod);
a.a_dvp = dvp;
-#ifdef VNODE_LOCKDEBUG
- islocked_dvp = (dvp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(dvp) == LK_EXCLUSIVE) : 1;
- if (islocked_dvp != 1)
- panic("vop_mknod: dvp: locked %d, expected %d", islocked_dvp, 1);
-#endif
a.a_vpp = vpp;
a.a_cnp = cnp;
a.a_vap = vap;
@@ -255,16 +232,8 @@
int error;
bool mpsafe;
struct vop_open_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_open);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("vop_open: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_mode = mode;
a.a_cred = cred;
mpsafe = (vp->v_vflag & VV_MPSAFE);
@@ -296,16 +265,8 @@
int error;
bool mpsafe;
struct vop_close_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_close);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("vop_close: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_fflag = fflag;
a.a_cred = cred;
mpsafe = (vp->v_vflag & VV_MPSAFE);
@@ -337,16 +298,8 @@
int error;
bool mpsafe;
struct vop_access_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_access);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("vop_access: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_mode = mode;
a.a_cred = cred;
mpsafe = (vp->v_vflag & VV_MPSAFE);
@@ -378,8 +331,6 @@
int error;
bool mpsafe;
struct vop_getattr_args a;
-#ifdef VNODE_LOCKDEBUG
-#endif
a.a_desc = VDESC(vop_getattr);
a.a_vp = vp;
a.a_vap = vap;
@@ -413,16 +364,8 @@
int error;
bool mpsafe;
struct vop_setattr_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_setattr);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("vop_setattr: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_vap = vap;
a.a_cred = cred;
mpsafe = (vp->v_vflag & VV_MPSAFE);
@@ -455,16 +398,8 @@
int error;
bool mpsafe;
struct vop_read_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_read);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("vop_read: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_uio = uio;
a.a_ioflag = ioflag;
a.a_cred = cred;
@@ -498,16 +433,8 @@
int error;
bool mpsafe;
struct vop_write_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_write);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("vop_write: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_uio = uio;
a.a_ioflag = ioflag;
a.a_cred = cred;
@@ -542,16 +469,8 @@
int error;
bool mpsafe;
struct vop_ioctl_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_ioctl);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 0;
- if (islocked_vp != 0)
- panic("vop_ioctl: vp: locked %d, expected %d", islocked_vp, 0);
-#endif
a.a_command = command;
a.a_data = data;
a.a_fflag = fflag;
@@ -587,16 +506,8 @@
int error;
bool mpsafe;
struct vop_fcntl_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_fcntl);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 0;
- if (islocked_vp != 0)
- panic("vop_fcntl: vp: locked %d, expected %d", islocked_vp, 0);
-#endif
a.a_command = command;
a.a_data = data;
a.a_fflag = fflag;
@@ -629,16 +540,8 @@
int error;
bool mpsafe;
struct vop_poll_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_poll);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 0;
- if (islocked_vp != 0)
- panic("vop_poll: vp: locked %d, expected %d", islocked_vp, 0);
-#endif
a.a_events = events;
mpsafe = (vp->v_vflag & VV_MPSAFE);
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
@@ -668,16 +571,8 @@
int error;
bool mpsafe;
struct vop_kqfilter_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_kqfilter);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 0;
- if (islocked_vp != 0)
- panic("vop_kqfilter: vp: locked %d, expected %d", islocked_vp, 0);
-#endif
a.a_kn = kn;
mpsafe = (vp->v_vflag & VV_MPSAFE);
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
@@ -707,16 +602,8 @@
int error;
bool mpsafe;
struct vop_revoke_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_revoke);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 0;
- if (islocked_vp != 0)
- panic("vop_revoke: vp: locked %d, expected %d", islocked_vp, 0);
-#endif
a.a_flags = flags;
mpsafe = (vp->v_vflag & VV_MPSAFE);
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
@@ -747,8 +634,6 @@
int error;
bool mpsafe;
struct vop_mmap_args a;
-#ifdef VNODE_LOCKDEBUG
-#endif
a.a_desc = VDESC(vop_mmap);
a.a_vp = vp;
a.a_prot = prot;
@@ -784,16 +669,8 @@
int error;
bool mpsafe;
struct vop_fsync_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_fsync);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("vop_fsync: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_cred = cred;
a.a_flags = flags;
a.a_offlo = offlo;
@@ -828,8 +705,6 @@
int error;
bool mpsafe;
struct vop_seek_args a;
-#ifdef VNODE_LOCKDEBUG
-#endif
a.a_desc = VDESC(vop_seek);
a.a_vp = vp;
a.a_oldoff = oldoff;
@@ -865,23 +740,9 @@
int error;
bool mpsafe;
struct vop_remove_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_dvp;
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_remove);
a.a_dvp = dvp;
-#ifdef VNODE_LOCKDEBUG
- islocked_dvp = (dvp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(dvp) == LK_EXCLUSIVE) : 1;
- if (islocked_dvp != 1)
- panic("vop_remove: dvp: locked %d, expected %d", islocked_dvp, 1);
-#endif
- a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("vop_remove: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
+ a.a_vp = vp;
a.a_cnp = cnp;
mpsafe = (dvp->v_vflag & VV_MPSAFE);
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
@@ -913,23 +774,9 @@
int error;
bool mpsafe;
struct vop_link_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_dvp;
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_link);
a.a_dvp = dvp;
-#ifdef VNODE_LOCKDEBUG
- islocked_dvp = (dvp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(dvp) == LK_EXCLUSIVE) : 1;
- if (islocked_dvp != 1)
- panic("vop_link: dvp: locked %d, expected %d", islocked_dvp, 1);
-#endif
- a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 0;
- if (islocked_vp != 0)
- panic("vop_link: vp: locked %d, expected %d", islocked_vp, 0);
-#endif
+ a.a_vp = vp;
a.a_cnp = cnp;
mpsafe = (dvp->v_vflag & VV_MPSAFE);
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
@@ -966,31 +813,11 @@
int error;
bool mpsafe;
struct vop_rename_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_fdvp;
- int islocked_fvp;
- int islocked_tdvp;
-#endif
a.a_desc = VDESC(vop_rename);
a.a_fdvp = fdvp;
-#ifdef VNODE_LOCKDEBUG
- islocked_fdvp = (fdvp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(fdvp) == LK_EXCLUSIVE) : 0;
- if (islocked_fdvp != 0)
- panic("vop_rename: fdvp: locked %d, expected %d", islocked_fdvp, 0);
-#endif
a.a_fvp = fvp;
-#ifdef VNODE_LOCKDEBUG
- islocked_fvp = (fvp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(fvp) == LK_EXCLUSIVE) : 0;
- if (islocked_fvp != 0)
- panic("vop_rename: fvp: locked %d, expected %d", islocked_fvp, 0);
-#endif
a.a_fcnp = fcnp;
a.a_tdvp = tdvp;
-#ifdef VNODE_LOCKDEBUG
- islocked_tdvp = (tdvp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(tdvp) == LK_EXCLUSIVE) : 1;
- if (islocked_tdvp != 1)
- panic("vop_rename: tdvp: locked %d, expected %d", islocked_tdvp, 1);
-#endif
a.a_tvp = tvp;
a.a_tcnp = tcnp;
mpsafe = (fdvp->v_vflag & VV_MPSAFE);
@@ -1023,16 +850,8 @@
int error;
bool mpsafe;
struct vop_mkdir_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_dvp;
-#endif
a.a_desc = VDESC(vop_mkdir);
a.a_dvp = dvp;
-#ifdef VNODE_LOCKDEBUG
- islocked_dvp = (dvp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(dvp) == LK_EXCLUSIVE) : 1;
- if (islocked_dvp != 1)
- panic("vop_mkdir: dvp: locked %d, expected %d", islocked_dvp, 1);
-#endif
a.a_vpp = vpp;
a.a_cnp = cnp;
a.a_vap = vap;
@@ -1071,23 +890,9 @@
int error;
bool mpsafe;
struct vop_rmdir_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_dvp;
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_rmdir);
a.a_dvp = dvp;
-#ifdef VNODE_LOCKDEBUG
- islocked_dvp = (dvp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(dvp) == LK_EXCLUSIVE) : 1;
- if (islocked_dvp != 1)
- panic("vop_rmdir: dvp: locked %d, expected %d", islocked_dvp, 1);
-#endif
- a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("vop_rmdir: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
+ a.a_vp = vp;
a.a_cnp = cnp;
mpsafe = (dvp->v_vflag & VV_MPSAFE);
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
@@ -1120,16 +925,8 @@
int error;
bool mpsafe;
struct vop_symlink_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_dvp;
-#endif
a.a_desc = VDESC(vop_symlink);
a.a_dvp = dvp;
-#ifdef VNODE_LOCKDEBUG
- islocked_dvp = (dvp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(dvp) == LK_EXCLUSIVE) : 1;
- if (islocked_dvp != 1)
- panic("vop_symlink: dvp: locked %d, expected %d", islocked_dvp, 1);
-#endif
a.a_vpp = vpp;
a.a_cnp = cnp;
a.a_vap = vap;
@@ -1171,16 +968,8 @@
int error;
bool mpsafe;
struct vop_readdir_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_readdir);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("vop_readdir: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_uio = uio;
a.a_cred = cred;
a.a_eofflag = eofflag;
@@ -1215,16 +1004,8 @@
int error;
bool mpsafe;
struct vop_readlink_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_readlink);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("vop_readlink: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_uio = uio;
a.a_cred = cred;
mpsafe = (vp->v_vflag & VV_MPSAFE);
@@ -1255,8 +1036,6 @@
int error;
bool mpsafe;
struct vop_abortop_args a;
-#ifdef VNODE_LOCKDEBUG
-#endif
a.a_desc = VDESC(vop_abortop);
a.a_dvp = dvp;
a.a_cnp = cnp;
@@ -1288,16 +1067,8 @@
int error;
bool mpsafe;
struct vop_inactive_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_inactive);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("vop_inactive: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_recycle = recycle;
mpsafe = (vp->v_vflag & VV_MPSAFE);
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
@@ -1326,16 +1097,8 @@
int error;
bool mpsafe;
struct vop_reclaim_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_reclaim);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 0;
- if (islocked_vp != 0)
- panic("vop_reclaim: vp: locked %d, expected %d", islocked_vp, 0);
-#endif
mpsafe = (vp->v_vflag & VV_MPSAFE);
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
error = (VCALL(vp, VOFFSET(vop_reclaim), &a));
@@ -1364,16 +1127,8 @@
int error;
bool mpsafe;
struct vop_lock_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_lock);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 0;
- if (islocked_vp != 0)
- panic("vop_lock: vp: locked %d, expected %d", islocked_vp, 0);
-#endif
a.a_flags = flags;
mpsafe = (vp->v_vflag & VV_MPSAFE);
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
@@ -1403,16 +1158,8 @@
int error;
bool mpsafe;
struct vop_unlock_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_unlock);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("vop_unlock: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_flags = flags;
mpsafe = (vp->v_vflag & VV_MPSAFE);
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
@@ -1445,8 +1192,6 @@
int error;
bool mpsafe;
struct vop_bmap_args a;
-#ifdef VNODE_LOCKDEBUG
-#endif
a.a_desc = VDESC(vop_bmap);
a.a_vp = vp;
a.a_bn = bn;
@@ -1481,8 +1226,6 @@
int error;
bool mpsafe;
struct vop_strategy_args a;
-#ifdef VNODE_LOCKDEBUG
-#endif
a.a_desc = VDESC(vop_strategy);
a.a_vp = vp;
a.a_bp = bp;
@@ -1513,8 +1256,6 @@
int error;
bool mpsafe;
struct vop_print_args a;
-#ifdef VNODE_LOCKDEBUG
-#endif
a.a_desc = VDESC(vop_print);
a.a_vp = vp;
mpsafe = (vp->v_vflag & VV_MPSAFE);
@@ -1544,8 +1285,6 @@
int error;
bool mpsafe;
struct vop_islocked_args a;
-#ifdef VNODE_LOCKDEBUG
-#endif
a.a_desc = VDESC(vop_islocked);
a.a_vp = vp;
mpsafe = (vp->v_vflag & VV_MPSAFE);
@@ -1577,16 +1316,8 @@
int error;
bool mpsafe;
struct vop_pathconf_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_pathconf);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("vop_pathconf: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_name = name;
a.a_retval = retval;
mpsafe = (vp->v_vflag & VV_MPSAFE);
@@ -1620,16 +1351,8 @@
int error;
bool mpsafe;
struct vop_advlock_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_advlock);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 0;
- if (islocked_vp != 0)
- panic("vop_advlock: vp: locked %d, expected %d", islocked_vp, 0);
-#endif
a.a_id = id;
a.a_op = op;
a.a_fl = fl;
@@ -1663,16 +1386,8 @@
int error;
bool mpsafe;
struct vop_whiteout_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_dvp;
-#endif
a.a_desc = VDESC(vop_whiteout);
a.a_dvp = dvp;
-#ifdef VNODE_LOCKDEBUG
- islocked_dvp = (dvp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(dvp) == LK_EXCLUSIVE) : 1;
- if (islocked_dvp != 1)
- panic("vop_whiteout: dvp: locked %d, expected %d", islocked_dvp, 1);
-#endif
a.a_cnp = cnp;
a.a_flags = flags;
mpsafe = (dvp->v_vflag & VV_MPSAFE);
@@ -1709,8 +1424,6 @@
int error;
bool mpsafe;
struct vop_getpages_args a;
-#ifdef VNODE_LOCKDEBUG
-#endif
a.a_desc = VDESC(vop_getpages);
a.a_vp = vp;
a.a_offset = offset;
@@ -1750,8 +1463,6 @@
int error;
bool mpsafe;
struct vop_putpages_args a;
-#ifdef VNODE_LOCKDEBUG
-#endif
a.a_desc = VDESC(vop_putpages);
a.a_vp = vp;
a.a_offlo = offlo;
@@ -1786,16 +1497,8 @@
int error;
bool mpsafe;
struct vop_closeextattr_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_closeextattr);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("vop_closeextattr: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_commit = commit;
a.a_cred = cred;
mpsafe = (vp->v_vflag & VV_MPSAFE);
@@ -1830,16 +1533,8 @@
int error;
bool mpsafe;
struct vop_getextattr_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_getextattr);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("vop_getextattr: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_attrnamespace = attrnamespace;
a.a_name = name;
a.a_uio = uio;
@@ -1876,16 +1571,8 @@
int error;
bool mpsafe;
struct vop_listextattr_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_listextattr);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("vop_listextattr: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_attrnamespace = attrnamespace;
a.a_uio = uio;
a.a_size = size;
@@ -1918,16 +1605,8 @@
int error;
bool mpsafe;
struct vop_openextattr_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_openextattr);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("vop_openextattr: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_cred = cred;
mpsafe = (vp->v_vflag & VV_MPSAFE);
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
@@ -1959,16 +1638,8 @@
int error;
bool mpsafe;
struct vop_deleteextattr_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_deleteextattr);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("vop_deleteextattr: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_attrnamespace = attrnamespace;
a.a_name = name;
a.a_cred = cred;
@@ -2003,16 +1674,8 @@
int error;
bool mpsafe;
struct vop_setextattr_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(vop_setextattr);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("vop_setextattr: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_attrnamespace = attrnamespace;
a.a_name = name;
a.a_uio = uio;
Index: src/sys/rump/include/rump/rumpvnode_if.h
diff -u src/sys/rump/include/rump/rumpvnode_if.h:1.2 src/sys/rump/include/rump/rumpvnode_if.h:1.3
--- src/sys/rump/include/rump/rumpvnode_if.h:1.2 Mon Nov 17 08:59:33 2008
+++ src/sys/rump/include/rump/rumpvnode_if.h Tue Sep 29 11:54:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpvnode_if.h,v 1.2 2008/11/17 08:59:33 pooka Exp $ */
+/* $NetBSD: rumpvnode_if.h,v 1.3 2009/09/29 11:54:52 pooka Exp $ */
/*
* Warning: DO NOT EDIT! This file is automatically generated!
@@ -7,7 +7,7 @@
* Created from the file:
* NetBSD: vnode_if.src,v 1.58 2008/11/15 19:08:12 pooka Exp
* by the script:
- * NetBSD: vnode_if.sh,v 1.50 2008/11/17 08:46:03 pooka Exp
+ * NetBSD: vnode_if.sh,v 1.52 2009/09/29 11:51:02 pooka Exp
*/
/*
@@ -42,10 +42,6 @@
#ifndef _RUMP_RUMPVNODE_IF_H_
#define _RUMP_RUMPVNODE_IF_H_
-#ifdef _KERNEL_OPT
-#include "opt_vnode_lockdebug.h"
-#endif /* _KERNEL_OPT */
-
extern const struct vnodeop_desc rump_vop_default_desc;
Index: src/sys/rump/librump/rumpvfs/rumpvnode_if.c
diff -u src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.1 src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.2
--- src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.1 Wed Nov 19 14:10:49 2008
+++ src/sys/rump/librump/rumpvfs/rumpvnode_if.c Tue Sep 29 11:54:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpvnode_if.c,v 1.1 2008/11/19 14:10:49 pooka Exp $ */
+/* $NetBSD: rumpvnode_if.c,v 1.2 2009/09/29 11:54:52 pooka Exp $ */
/*
* Warning: DO NOT EDIT! This file is automatically generated!
@@ -7,7 +7,7 @@
* Created from the file:
* NetBSD: vnode_if.src,v 1.58 2008/11/15 19:08:12 pooka Exp
* by the script:
- * NetBSD: vnode_if.sh,v 1.50 2008/11/17 08:46:03 pooka Exp
+ * NetBSD: vnode_if.sh,v 1.52 2009/09/29 11:51:02 pooka Exp
*/
/*
@@ -40,10 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpvnode_if.c,v 1.1 2008/11/19 14:10:49 pooka Exp $");
-
-
-#include "opt_vnode_lockdebug.h"
+__KERNEL_RCSID(0, "$NetBSD: rumpvnode_if.c,v 1.2 2009/09/29 11:54:52 pooka Exp $");
#include <sys/param.h>
#include <sys/mount.h>
@@ -85,8 +82,6 @@
int error;
bool mpsafe;
struct rump_vop_bwrite_args a;
-#ifdef VNODE_LOCKDEBUG
-#endif
a.a_desc = VDESC(rump_vop_bwrite);
a.a_bp = bp;
mpsafe = (bp->b_vp->v_vflag & VV_MPSAFE);
@@ -120,8 +115,6 @@
int error;
bool mpsafe;
struct rump_vop_lookup_args a;
-#ifdef VNODE_LOCKDEBUG
-#endif
a.a_desc = VDESC(rump_vop_lookup);
a.a_dvp = dvp;
a.a_vpp = vpp;
@@ -161,16 +154,8 @@
int error;
bool mpsafe;
struct rump_vop_create_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_dvp;
-#endif
a.a_desc = VDESC(rump_vop_create);
a.a_dvp = dvp;
-#ifdef VNODE_LOCKDEBUG
- islocked_dvp = (dvp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(dvp) == LK_EXCLUSIVE) : 1;
- if (islocked_dvp != 1)
- panic("rump_vop_create: dvp: locked %d, expected %d", islocked_dvp, 1);
-#endif
a.a_vpp = vpp;
a.a_cnp = cnp;
a.a_vap = vap;
@@ -209,16 +194,8 @@
int error;
bool mpsafe;
struct rump_vop_mknod_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_dvp;
-#endif
a.a_desc = VDESC(rump_vop_mknod);
a.a_dvp = dvp;
-#ifdef VNODE_LOCKDEBUG
- islocked_dvp = (dvp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(dvp) == LK_EXCLUSIVE) : 1;
- if (islocked_dvp != 1)
- panic("rump_vop_mknod: dvp: locked %d, expected %d", islocked_dvp, 1);
-#endif
a.a_vpp = vpp;
a.a_cnp = cnp;
a.a_vap = vap;
@@ -256,16 +233,8 @@
int error;
bool mpsafe;
struct rump_vop_open_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_open);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("rump_vop_open: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_mode = mode;
a.a_cred = cred;
mpsafe = (vp->v_vflag & VV_MPSAFE);
@@ -297,16 +266,8 @@
int error;
bool mpsafe;
struct rump_vop_close_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_close);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("rump_vop_close: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_fflag = fflag;
a.a_cred = cred;
mpsafe = (vp->v_vflag & VV_MPSAFE);
@@ -338,16 +299,8 @@
int error;
bool mpsafe;
struct rump_vop_access_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_access);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("rump_vop_access: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_mode = mode;
a.a_cred = cred;
mpsafe = (vp->v_vflag & VV_MPSAFE);
@@ -379,8 +332,6 @@
int error;
bool mpsafe;
struct rump_vop_getattr_args a;
-#ifdef VNODE_LOCKDEBUG
-#endif
a.a_desc = VDESC(rump_vop_getattr);
a.a_vp = vp;
a.a_vap = vap;
@@ -414,16 +365,8 @@
int error;
bool mpsafe;
struct rump_vop_setattr_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_setattr);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("rump_vop_setattr: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_vap = vap;
a.a_cred = cred;
mpsafe = (vp->v_vflag & VV_MPSAFE);
@@ -456,16 +399,8 @@
int error;
bool mpsafe;
struct rump_vop_read_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_read);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("rump_vop_read: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_uio = uio;
a.a_ioflag = ioflag;
a.a_cred = cred;
@@ -499,16 +434,8 @@
int error;
bool mpsafe;
struct rump_vop_write_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_write);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("rump_vop_write: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_uio = uio;
a.a_ioflag = ioflag;
a.a_cred = cred;
@@ -543,16 +470,8 @@
int error;
bool mpsafe;
struct rump_vop_ioctl_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_ioctl);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 0;
- if (islocked_vp != 0)
- panic("rump_vop_ioctl: vp: locked %d, expected %d", islocked_vp, 0);
-#endif
a.a_command = command;
a.a_data = data;
a.a_fflag = fflag;
@@ -588,16 +507,8 @@
int error;
bool mpsafe;
struct rump_vop_fcntl_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_fcntl);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 0;
- if (islocked_vp != 0)
- panic("rump_vop_fcntl: vp: locked %d, expected %d", islocked_vp, 0);
-#endif
a.a_command = command;
a.a_data = data;
a.a_fflag = fflag;
@@ -630,16 +541,8 @@
int error;
bool mpsafe;
struct rump_vop_poll_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_poll);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 0;
- if (islocked_vp != 0)
- panic("rump_vop_poll: vp: locked %d, expected %d", islocked_vp, 0);
-#endif
a.a_events = events;
mpsafe = (vp->v_vflag & VV_MPSAFE);
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
@@ -669,16 +572,8 @@
int error;
bool mpsafe;
struct rump_vop_kqfilter_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_kqfilter);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 0;
- if (islocked_vp != 0)
- panic("rump_vop_kqfilter: vp: locked %d, expected %d", islocked_vp, 0);
-#endif
a.a_kn = kn;
mpsafe = (vp->v_vflag & VV_MPSAFE);
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
@@ -708,16 +603,8 @@
int error;
bool mpsafe;
struct rump_vop_revoke_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_revoke);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 0;
- if (islocked_vp != 0)
- panic("rump_vop_revoke: vp: locked %d, expected %d", islocked_vp, 0);
-#endif
a.a_flags = flags;
mpsafe = (vp->v_vflag & VV_MPSAFE);
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
@@ -748,8 +635,6 @@
int error;
bool mpsafe;
struct rump_vop_mmap_args a;
-#ifdef VNODE_LOCKDEBUG
-#endif
a.a_desc = VDESC(rump_vop_mmap);
a.a_vp = vp;
a.a_prot = prot;
@@ -785,16 +670,8 @@
int error;
bool mpsafe;
struct rump_vop_fsync_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_fsync);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("rump_vop_fsync: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_cred = cred;
a.a_flags = flags;
a.a_offlo = offlo;
@@ -829,8 +706,6 @@
int error;
bool mpsafe;
struct rump_vop_seek_args a;
-#ifdef VNODE_LOCKDEBUG
-#endif
a.a_desc = VDESC(rump_vop_seek);
a.a_vp = vp;
a.a_oldoff = oldoff;
@@ -866,23 +741,9 @@
int error;
bool mpsafe;
struct rump_vop_remove_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_dvp;
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_remove);
a.a_dvp = dvp;
-#ifdef VNODE_LOCKDEBUG
- islocked_dvp = (dvp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(dvp) == LK_EXCLUSIVE) : 1;
- if (islocked_dvp != 1)
- panic("rump_vop_remove: dvp: locked %d, expected %d", islocked_dvp, 1);
-#endif
- a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("rump_vop_remove: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
+ a.a_vp = vp;
a.a_cnp = cnp;
mpsafe = (dvp->v_vflag & VV_MPSAFE);
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
@@ -914,23 +775,9 @@
int error;
bool mpsafe;
struct rump_vop_link_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_dvp;
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_link);
a.a_dvp = dvp;
-#ifdef VNODE_LOCKDEBUG
- islocked_dvp = (dvp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(dvp) == LK_EXCLUSIVE) : 1;
- if (islocked_dvp != 1)
- panic("rump_vop_link: dvp: locked %d, expected %d", islocked_dvp, 1);
-#endif
- a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 0;
- if (islocked_vp != 0)
- panic("rump_vop_link: vp: locked %d, expected %d", islocked_vp, 0);
-#endif
+ a.a_vp = vp;
a.a_cnp = cnp;
mpsafe = (dvp->v_vflag & VV_MPSAFE);
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
@@ -967,31 +814,11 @@
int error;
bool mpsafe;
struct rump_vop_rename_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_fdvp;
- int islocked_fvp;
- int islocked_tdvp;
-#endif
a.a_desc = VDESC(rump_vop_rename);
a.a_fdvp = fdvp;
-#ifdef VNODE_LOCKDEBUG
- islocked_fdvp = (fdvp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(fdvp) == LK_EXCLUSIVE) : 0;
- if (islocked_fdvp != 0)
- panic("rump_vop_rename: fdvp: locked %d, expected %d", islocked_fdvp, 0);
-#endif
a.a_fvp = fvp;
-#ifdef VNODE_LOCKDEBUG
- islocked_fvp = (fvp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(fvp) == LK_EXCLUSIVE) : 0;
- if (islocked_fvp != 0)
- panic("rump_vop_rename: fvp: locked %d, expected %d", islocked_fvp, 0);
-#endif
a.a_fcnp = fcnp;
a.a_tdvp = tdvp;
-#ifdef VNODE_LOCKDEBUG
- islocked_tdvp = (tdvp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(tdvp) == LK_EXCLUSIVE) : 1;
- if (islocked_tdvp != 1)
- panic("rump_vop_rename: tdvp: locked %d, expected %d", islocked_tdvp, 1);
-#endif
a.a_tvp = tvp;
a.a_tcnp = tcnp;
mpsafe = (fdvp->v_vflag & VV_MPSAFE);
@@ -1024,16 +851,8 @@
int error;
bool mpsafe;
struct rump_vop_mkdir_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_dvp;
-#endif
a.a_desc = VDESC(rump_vop_mkdir);
a.a_dvp = dvp;
-#ifdef VNODE_LOCKDEBUG
- islocked_dvp = (dvp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(dvp) == LK_EXCLUSIVE) : 1;
- if (islocked_dvp != 1)
- panic("rump_vop_mkdir: dvp: locked %d, expected %d", islocked_dvp, 1);
-#endif
a.a_vpp = vpp;
a.a_cnp = cnp;
a.a_vap = vap;
@@ -1072,23 +891,9 @@
int error;
bool mpsafe;
struct rump_vop_rmdir_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_dvp;
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_rmdir);
a.a_dvp = dvp;
-#ifdef VNODE_LOCKDEBUG
- islocked_dvp = (dvp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(dvp) == LK_EXCLUSIVE) : 1;
- if (islocked_dvp != 1)
- panic("rump_vop_rmdir: dvp: locked %d, expected %d", islocked_dvp, 1);
-#endif
- a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("rump_vop_rmdir: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
+ a.a_vp = vp;
a.a_cnp = cnp;
mpsafe = (dvp->v_vflag & VV_MPSAFE);
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
@@ -1121,16 +926,8 @@
int error;
bool mpsafe;
struct rump_vop_symlink_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_dvp;
-#endif
a.a_desc = VDESC(rump_vop_symlink);
a.a_dvp = dvp;
-#ifdef VNODE_LOCKDEBUG
- islocked_dvp = (dvp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(dvp) == LK_EXCLUSIVE) : 1;
- if (islocked_dvp != 1)
- panic("rump_vop_symlink: dvp: locked %d, expected %d", islocked_dvp, 1);
-#endif
a.a_vpp = vpp;
a.a_cnp = cnp;
a.a_vap = vap;
@@ -1172,16 +969,8 @@
int error;
bool mpsafe;
struct rump_vop_readdir_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_readdir);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("rump_vop_readdir: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_uio = uio;
a.a_cred = cred;
a.a_eofflag = eofflag;
@@ -1216,16 +1005,8 @@
int error;
bool mpsafe;
struct rump_vop_readlink_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_readlink);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("rump_vop_readlink: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_uio = uio;
a.a_cred = cred;
mpsafe = (vp->v_vflag & VV_MPSAFE);
@@ -1256,8 +1037,6 @@
int error;
bool mpsafe;
struct rump_vop_abortop_args a;
-#ifdef VNODE_LOCKDEBUG
-#endif
a.a_desc = VDESC(rump_vop_abortop);
a.a_dvp = dvp;
a.a_cnp = cnp;
@@ -1289,16 +1068,8 @@
int error;
bool mpsafe;
struct rump_vop_inactive_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_inactive);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("rump_vop_inactive: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_recycle = recycle;
mpsafe = (vp->v_vflag & VV_MPSAFE);
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
@@ -1327,16 +1098,8 @@
int error;
bool mpsafe;
struct rump_vop_reclaim_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_reclaim);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 0;
- if (islocked_vp != 0)
- panic("rump_vop_reclaim: vp: locked %d, expected %d", islocked_vp, 0);
-#endif
mpsafe = (vp->v_vflag & VV_MPSAFE);
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
error = (VCALL(vp, VOFFSET(rump_vop_reclaim), &a));
@@ -1365,16 +1128,8 @@
int error;
bool mpsafe;
struct rump_vop_lock_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_lock);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 0;
- if (islocked_vp != 0)
- panic("rump_vop_lock: vp: locked %d, expected %d", islocked_vp, 0);
-#endif
a.a_flags = flags;
mpsafe = (vp->v_vflag & VV_MPSAFE);
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
@@ -1404,16 +1159,8 @@
int error;
bool mpsafe;
struct rump_vop_unlock_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_unlock);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("rump_vop_unlock: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_flags = flags;
mpsafe = (vp->v_vflag & VV_MPSAFE);
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
@@ -1446,8 +1193,6 @@
int error;
bool mpsafe;
struct rump_vop_bmap_args a;
-#ifdef VNODE_LOCKDEBUG
-#endif
a.a_desc = VDESC(rump_vop_bmap);
a.a_vp = vp;
a.a_bn = bn;
@@ -1482,8 +1227,6 @@
int error;
bool mpsafe;
struct rump_vop_strategy_args a;
-#ifdef VNODE_LOCKDEBUG
-#endif
a.a_desc = VDESC(rump_vop_strategy);
a.a_vp = vp;
a.a_bp = bp;
@@ -1514,8 +1257,6 @@
int error;
bool mpsafe;
struct rump_vop_print_args a;
-#ifdef VNODE_LOCKDEBUG
-#endif
a.a_desc = VDESC(rump_vop_print);
a.a_vp = vp;
mpsafe = (vp->v_vflag & VV_MPSAFE);
@@ -1545,8 +1286,6 @@
int error;
bool mpsafe;
struct rump_vop_islocked_args a;
-#ifdef VNODE_LOCKDEBUG
-#endif
a.a_desc = VDESC(rump_vop_islocked);
a.a_vp = vp;
mpsafe = (vp->v_vflag & VV_MPSAFE);
@@ -1578,16 +1317,8 @@
int error;
bool mpsafe;
struct rump_vop_pathconf_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_pathconf);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("rump_vop_pathconf: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_name = name;
a.a_retval = retval;
mpsafe = (vp->v_vflag & VV_MPSAFE);
@@ -1621,16 +1352,8 @@
int error;
bool mpsafe;
struct rump_vop_advlock_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_advlock);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 0;
- if (islocked_vp != 0)
- panic("rump_vop_advlock: vp: locked %d, expected %d", islocked_vp, 0);
-#endif
a.a_id = id;
a.a_op = op;
a.a_fl = fl;
@@ -1664,16 +1387,8 @@
int error;
bool mpsafe;
struct rump_vop_whiteout_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_dvp;
-#endif
a.a_desc = VDESC(rump_vop_whiteout);
a.a_dvp = dvp;
-#ifdef VNODE_LOCKDEBUG
- islocked_dvp = (dvp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(dvp) == LK_EXCLUSIVE) : 1;
- if (islocked_dvp != 1)
- panic("rump_vop_whiteout: dvp: locked %d, expected %d", islocked_dvp, 1);
-#endif
a.a_cnp = cnp;
a.a_flags = flags;
mpsafe = (dvp->v_vflag & VV_MPSAFE);
@@ -1710,8 +1425,6 @@
int error;
bool mpsafe;
struct rump_vop_getpages_args a;
-#ifdef VNODE_LOCKDEBUG
-#endif
a.a_desc = VDESC(rump_vop_getpages);
a.a_vp = vp;
a.a_offset = offset;
@@ -1751,8 +1464,6 @@
int error;
bool mpsafe;
struct rump_vop_putpages_args a;
-#ifdef VNODE_LOCKDEBUG
-#endif
a.a_desc = VDESC(rump_vop_putpages);
a.a_vp = vp;
a.a_offlo = offlo;
@@ -1787,16 +1498,8 @@
int error;
bool mpsafe;
struct rump_vop_closeextattr_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_closeextattr);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("rump_vop_closeextattr: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_commit = commit;
a.a_cred = cred;
mpsafe = (vp->v_vflag & VV_MPSAFE);
@@ -1831,16 +1534,8 @@
int error;
bool mpsafe;
struct rump_vop_getextattr_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_getextattr);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("rump_vop_getextattr: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_attrnamespace = attrnamespace;
a.a_name = name;
a.a_uio = uio;
@@ -1877,16 +1572,8 @@
int error;
bool mpsafe;
struct rump_vop_listextattr_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_listextattr);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("rump_vop_listextattr: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_attrnamespace = attrnamespace;
a.a_uio = uio;
a.a_size = size;
@@ -1919,16 +1606,8 @@
int error;
bool mpsafe;
struct rump_vop_openextattr_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_openextattr);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("rump_vop_openextattr: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_cred = cred;
mpsafe = (vp->v_vflag & VV_MPSAFE);
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
@@ -1960,16 +1639,8 @@
int error;
bool mpsafe;
struct rump_vop_deleteextattr_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_deleteextattr);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("rump_vop_deleteextattr: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_attrnamespace = attrnamespace;
a.a_name = name;
a.a_cred = cred;
@@ -2004,16 +1675,8 @@
int error;
bool mpsafe;
struct rump_vop_setextattr_args a;
-#ifdef VNODE_LOCKDEBUG
- int islocked_vp;
-#endif
a.a_desc = VDESC(rump_vop_setextattr);
a.a_vp = vp;
-#ifdef VNODE_LOCKDEBUG
- islocked_vp = (vp->v_vflag & VV_LOCKSWORK) ? (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) : 1;
- if (islocked_vp != 1)
- panic("rump_vop_setextattr: vp: locked %d, expected %d", islocked_vp, 1);
-#endif
a.a_attrnamespace = attrnamespace;
a.a_name = name;
a.a_uio = uio;
Index: src/sys/sys/vnode_if.h
diff -u src/sys/sys/vnode_if.h:1.74 src/sys/sys/vnode_if.h:1.75
--- src/sys/sys/vnode_if.h:1.74 Mon Nov 17 08:59:33 2008
+++ src/sys/sys/vnode_if.h Tue Sep 29 11:54:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vnode_if.h,v 1.74 2008/11/17 08:59:33 pooka Exp $ */
+/* $NetBSD: vnode_if.h,v 1.75 2009/09/29 11:54:52 pooka Exp $ */
/*
* Warning: DO NOT EDIT! This file is automatically generated!
@@ -7,7 +7,7 @@
* Created from the file:
* NetBSD: vnode_if.src,v 1.58 2008/11/15 19:08:12 pooka Exp
* by the script:
- * NetBSD: vnode_if.sh,v 1.50 2008/11/17 08:46:03 pooka Exp
+ * NetBSD: vnode_if.sh,v 1.52 2009/09/29 11:51:02 pooka Exp
*/
/*
@@ -42,10 +42,6 @@
#ifndef _SYS_VNODE_IF_H_
#define _SYS_VNODE_IF_H_
-#ifdef _KERNEL_OPT
-#include "opt_vnode_lockdebug.h"
-#endif /* _KERNEL_OPT */
-
extern const struct vnodeop_desc vop_default_desc;
