Updated generated files

1 files changed, 97 insertions, 15 deletions

diff --git a/sys/sys/vnode_if.h b/sys/sys/vnode_if.h
index e334c6e2a18..2a64bd4118f 100644
--- a/sys/sys/vnode_if.h
+++ b/sys/sys/vnode_if.h
@@ -43,6 +43,22 @@
 
 extern struct vnodeop_desc vop_default_desc;
 
+#include "systm.h"
+
+struct vop_islocked_args {
+	struct vnodeop_desc *a_desc;
+	struct vnode *a_vp;
+};
+extern struct vnodeop_desc vop_islocked_desc;
+static __inline int VOP_ISLOCKED __P((struct vnode *));
+static __inline int VOP_ISLOCKED(vp)
+	struct vnode *vp;
+{
+	struct vop_islocked_args a;
+	a.a_desc = VDESC(vop_islocked);
+	a.a_vp = vp;
+	return (VCALL(vp, VOFFSET(vop_islocked), &a));
+}
 
 struct vop_lookup_args {
 	struct vnodeop_desc *a_desc;
@@ -85,6 +101,9 @@ static __inline int VOP_CREATE(dvp, vpp, cnp, vap)
 	struct vop_create_args a;
 	a.a_desc = VDESC(vop_create);
 	a.a_dvp = dvp;
+#ifdef DIAGNOSTIC
+	if ((dvp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(dvp)) panic("vop_create: dvp");
+#endif
 	a.a_vpp = vpp;
 	a.a_cnp = cnp;
 	a.a_vap = vap;
@@ -110,6 +129,9 @@ static __inline int VOP_MKNOD(dvp, vpp, cnp, vap)
 	struct vop_mknod_args a;
 	a.a_desc = VDESC(vop_mknod);
 	a.a_dvp = dvp;
+#ifdef DIAGNOSTIC
+	if ((dvp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(dvp)) panic("vop_mknod: dvp");
+#endif
 	a.a_vpp = vpp;
 	a.a_cnp = cnp;
 	a.a_vap = vap;
@@ -185,6 +207,9 @@ static __inline int VOP_ACCESS(vp, mode, cred, p)
 	struct vop_access_args a;
 	a.a_desc = VDESC(vop_access);
 	a.a_vp = vp;
+#ifdef DIAGNOSTIC
+	if ((vp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(vp)) panic("vop_access: vp");
+#endif
 	a.a_mode = mode;
 	a.a_cred = cred;
 	a.a_p = p;
@@ -235,6 +260,9 @@ static __inline int VOP_SETATTR(vp, vap, cred, p)
 	struct vop_setattr_args a;
 	a.a_desc = VDESC(vop_setattr);
 	a.a_vp = vp;
+#ifdef DIAGNOSTIC
+	if ((vp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(vp)) panic("vop_setattr: vp");
+#endif
 	a.a_vap = vap;
 	a.a_cred = cred;
 	a.a_p = p;
@@ -260,6 +288,9 @@ static __inline int VOP_READ(vp, uio, ioflag, cred)
 	struct vop_read_args a;
 	a.a_desc = VDESC(vop_read);
 	a.a_vp = vp;
+#ifdef DIAGNOSTIC
+	if ((vp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(vp)) panic("vop_read: vp");
+#endif
 	a.a_uio = uio;
 	a.a_ioflag = ioflag;
 	a.a_cred = cred;
@@ -285,6 +316,9 @@ static __inline int VOP_WRITE(vp, uio, ioflag, cred)
 	struct vop_write_args a;
 	a.a_desc = VDESC(vop_write);
 	a.a_vp = vp;
+#ifdef DIAGNOSTIC
+	if ((vp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(vp)) panic("vop_write: vp");
+#endif
 	a.a_uio = uio;
 	a.a_ioflag = ioflag;
 	a.a_cred = cred;
@@ -437,6 +471,9 @@ static __inline int VOP_FSYNC(vp, cred, waitfor, p)
 	struct vop_fsync_args a;
 	a.a_desc = VDESC(vop_fsync);
 	a.a_vp = vp;
+#ifdef DIAGNOSTIC
+	if ((vp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(vp)) panic("vop_fsync: vp");
+#endif
 	a.a_cred = cred;
 	a.a_waitfor = waitfor;
 	a.a_p = p;
@@ -485,7 +522,13 @@ static __inline int VOP_REMOVE(dvp, vp, cnp)
 	struct vop_remove_args a;
 	a.a_desc = VDESC(vop_remove);
 	a.a_dvp = dvp;
+#ifdef DIAGNOSTIC
+	if ((dvp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(dvp)) panic("vop_remove: dvp");
+#endif
 	a.a_vp = vp;
+#ifdef DIAGNOSTIC
+	if ((vp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(vp)) panic("vop_remove: vp");
+#endif
 	a.a_cnp = cnp;
 	return (VCALL(dvp, VOFFSET(vop_remove), &a));
 }
@@ -507,6 +550,9 @@ static __inline int VOP_LINK(dvp, vp, cnp)
 	struct vop_link_args a;
 	a.a_desc = VDESC(vop_link);
 	a.a_dvp = dvp;
+#ifdef DIAGNOSTIC
+	if ((dvp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(dvp)) panic("vop_link: dvp");
+#endif
 	a.a_vp = vp;
 	a.a_cnp = cnp;
 	return (VCALL(dvp, VOFFSET(vop_link), &a));
@@ -539,6 +585,9 @@ static __inline int VOP_RENAME(fdvp, fvp, fcnp, tdvp, tvp, tcnp)
 	a.a_fvp = fvp;
 	a.a_fcnp = fcnp;
 	a.a_tdvp = tdvp;
+#ifdef DIAGNOSTIC
+	if ((tdvp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(tdvp)) panic("vop_rename: tdvp");
+#endif
 	a.a_tvp = tvp;
 	a.a_tcnp = tcnp;
 	return (VCALL(fdvp, VOFFSET(vop_rename), &a));
@@ -563,6 +612,9 @@ static __inline int VOP_MKDIR(dvp, vpp, cnp, vap)
 	struct vop_mkdir_args a;
 	a.a_desc = VDESC(vop_mkdir);
 	a.a_dvp = dvp;
+#ifdef DIAGNOSTIC
+	if ((dvp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(dvp)) panic("vop_mkdir: dvp");
+#endif
 	a.a_vpp = vpp;
 	a.a_cnp = cnp;
 	a.a_vap = vap;
@@ -586,7 +638,13 @@ static __inline int VOP_RMDIR(dvp, vp, cnp)
 	struct vop_rmdir_args a;
 	a.a_desc = VDESC(vop_rmdir);
 	a.a_dvp = dvp;
+#ifdef DIAGNOSTIC
+	if ((dvp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(dvp)) panic("vop_rmdir: dvp");
+#endif
 	a.a_vp = vp;
+#ifdef DIAGNOSTIC
+	if ((vp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(vp)) panic("vop_rmdir: vp");
+#endif
 	a.a_cnp = cnp;
 	return (VCALL(dvp, VOFFSET(vop_rmdir), &a));
 }
@@ -612,6 +670,9 @@ static __inline int VOP_SYMLINK(dvp, vpp, cnp, vap, target)
 	struct vop_symlink_args a;
 	a.a_desc = VDESC(vop_symlink);
 	a.a_dvp = dvp;
+#ifdef DIAGNOSTIC
+	if ((dvp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(dvp)) panic("vop_symlink: dvp");
+#endif
 	a.a_vpp = vpp;
 	a.a_cnp = cnp;
 	a.a_vap = vap;
@@ -642,6 +703,9 @@ static __inline int VOP_READDIR(vp, uio, cred, eofflag, ncookies, cookies)
 	struct vop_readdir_args a;
 	a.a_desc = VDESC(vop_readdir);
 	a.a_vp = vp;
+#ifdef DIAGNOSTIC
+	if ((vp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(vp)) panic("vop_readdir: vp");
+#endif
 	a.a_uio = uio;
 	a.a_cred = cred;
 	a.a_eofflag = eofflag;
@@ -667,6 +731,9 @@ static __inline int VOP_READLINK(vp, uio, cred)
 	struct vop_readlink_args a;
 	a.a_desc = VDESC(vop_readlink);
 	a.a_vp = vp;
+#ifdef DIAGNOSTIC
+	if ((vp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(vp)) panic("vop_readlink: vp");
+#endif
 	a.a_uio = uio;
 	a.a_cred = cred;
 	return (VCALL(vp, VOFFSET(vop_readlink), &a));
@@ -704,6 +771,9 @@ static __inline int VOP_INACTIVE(vp, p)
 	struct vop_inactive_args a;
 	a.a_desc = VDESC(vop_inactive);
 	a.a_vp = vp;
+#ifdef DIAGNOSTIC
+	if ((vp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(vp)) panic("vop_inactive: vp");
+#endif
 	a.a_p = p;
 	return (VCALL(vp, VOFFSET(vop_inactive), &a));
 }
@@ -789,6 +859,9 @@ static __inline int VOP_BMAP(vp, bn, vpp, bnp, runp)
 	struct vop_bmap_args a;
 	a.a_desc = VDESC(vop_bmap);
 	a.a_vp = vp;
+#ifdef DIAGNOSTIC
+	if ((vp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(vp)) panic("vop_bmap: vp");
+#endif
 	a.a_bn = bn;
 	a.a_vpp = vpp;
 	a.a_bnp = bnp;
@@ -811,21 +884,6 @@ static __inline int VOP_PRINT(vp)
 	return (VCALL(vp, VOFFSET(vop_print), &a));
 }
 
-struct vop_islocked_args {
-	struct vnodeop_desc *a_desc;
-	struct vnode *a_vp;
-};
-extern struct vnodeop_desc vop_islocked_desc;
-static __inline int VOP_ISLOCKED __P((struct vnode *));
-static __inline int VOP_ISLOCKED(vp)
-	struct vnode *vp;
-{
-	struct vop_islocked_args a;
-	a.a_desc = VDESC(vop_islocked);
-	a.a_vp = vp;
-	return (VCALL(vp, VOFFSET(vop_islocked), &a));
-}
-
 struct vop_pathconf_args {
 	struct vnodeop_desc *a_desc;
 	struct vnode *a_vp;
@@ -894,6 +952,9 @@ static __inline int VOP_BLKATOFF(vp, offset, res, bpp)
 	struct vop_blkatoff_args a;
 	a.a_desc = VDESC(vop_blkatoff);
 	a.a_vp = vp;
+#ifdef DIAGNOSTIC
+	if ((vp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(vp)) panic("vop_blkatoff: vp");
+#endif
 	a.a_offset = offset;
 	a.a_res = res;
 	a.a_bpp = bpp;
@@ -919,6 +980,9 @@ static __inline int VOP_VALLOC(pvp, mode, cred, vpp)
 	struct vop_valloc_args a;
 	a.a_desc = VDESC(vop_valloc);
 	a.a_pvp = pvp;
+#ifdef DIAGNOSTIC
+	if ((pvp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(pvp)) panic("vop_valloc: pvp");
+#endif
 	a.a_mode = mode;
 	a.a_cred = cred;
 	a.a_vpp = vpp;
@@ -948,6 +1012,9 @@ static __inline int VOP_BALLOC(vp, startoffset, size, cred, flags, bpp)
 	struct vop_balloc_args a;
 	a.a_desc = VDESC(vop_balloc);
 	a.a_vp = vp;
+#ifdef DIAGNOSTIC
+	if ((vp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(vp)) panic("vop_balloc: vp");
+#endif
 	a.a_startoffset = startoffset;
 	a.a_size = size;
 	a.a_cred = cred;
@@ -971,6 +1038,9 @@ static __inline int VOP_REALLOCBLKS(vp, buflist)
 	struct vop_reallocblks_args a;
 	a.a_desc = VDESC(vop_reallocblks);
 	a.a_vp = vp;
+#ifdef DIAGNOSTIC
+	if ((vp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(vp)) panic("vop_reallocblks: vp");
+#endif
 	a.a_buflist = buflist;
 	return (VCALL(vp, VOFFSET(vop_reallocblks), &a));
 }
@@ -991,6 +1061,9 @@ static __inline int VOP_VFREE(pvp, ino, mode)
 	struct vop_vfree_args a;
 	a.a_desc = VDESC(vop_vfree);
 	a.a_pvp = pvp;
+#ifdef DIAGNOSTIC
+	if ((pvp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(pvp)) panic("vop_vfree: pvp");
+#endif
 	a.a_ino = ino;
 	a.a_mode = mode;
 	return (VCALL(pvp, VOFFSET(vop_vfree), &a));
@@ -1017,6 +1090,9 @@ static __inline int VOP_TRUNCATE(vp, length, flags, cred, p)
 	struct vop_truncate_args a;
 	a.a_desc = VDESC(vop_truncate);
 	a.a_vp = vp;
+#ifdef DIAGNOSTIC
+	if ((vp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(vp)) panic("vop_truncate: vp");
+#endif
 	a.a_length = length;
 	a.a_flags = flags;
 	a.a_cred = cred;
@@ -1043,6 +1119,9 @@ static __inline int VOP_UPDATE(vp, access, modify, waitfor)
 	struct vop_update_args a;
 	a.a_desc = VDESC(vop_update);
 	a.a_vp = vp;
+#ifdef DIAGNOSTIC
+	if ((vp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(vp)) panic("vop_update: vp");
+#endif
 	a.a_access = access;
 	a.a_modify = modify;
 	a.a_waitfor = waitfor;
@@ -1066,6 +1145,9 @@ static __inline int VOP_WHITEOUT(dvp, cnp, flags)
 	struct vop_whiteout_args a;
 	a.a_desc = VDESC(vop_whiteout);
 	a.a_dvp = dvp;
+#ifdef DIAGNOSTIC
+	if ((dvp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(dvp)) panic("vop_whiteout: dvp");
+#endif
 	a.a_cnp = cnp;
 	a.a_flags = flags;
 	return (VCALL(dvp, VOFFSET(vop_whiteout), &a));