[src/trunk]: src/sys regen: remove VNODE_LOCKDEBUG

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/239fc836dc6f
branches:  trunk
changeset: 747723:239fc836dc6f
user:      pooka <pooka%NetBSD.org@localhost>
date:      Tue Sep 29 11:54:52 2009 +0000

description:
regen: remove VNODE_LOCKDEBUG

diffstat:

 sys/kern/vnode_if.c                     |  343 +-------------------------------
 sys/rump/include/rump/rumpvnode_if.h    |    8 +-
 sys/rump/librump/rumpvfs/rumpvnode_if.c |  343 +-------------------------------
 sys/sys/vnode_if.h                      |    8 +-
 4 files changed, 10 insertions(+), 692 deletions(-)

diffs (truncated from 1596 to 300 lines):

diff -r 4ac1eb4417ae -r 239fc836dc6f sys/kern/vnode_if.c
--- a/sys/kern/vnode_if.c       Tue Sep 29 11:51:02 2009 +0000
+++ b/sys/kern/vnode_if.c       Tue Sep 29 11:54:52 2009 +0000
@@ -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);