From 24f932e907ec462f064e43b1b8cf5448569a1899 Mon Sep 17 00:00:00 2001 From: pooka Date: Thu, 30 Nov 2006 21:07:36 +0000 Subject: [PATCH] regen for VOP_FOO_DESCOFFSET change in vnode_if.sh --- sys/kern/vnode_if.c | 102 ++++++++++++++++++++++---------------------- sys/sys/vnode_if.h | 73 +++++++++++++++++++++++++------ 2 files changed, 112 insertions(+), 63 deletions(-) diff --git a/sys/kern/vnode_if.c b/sys/kern/vnode_if.c index 623f4e6aa45b..d703646abead 100644 --- a/sys/kern/vnode_if.c +++ b/sys/kern/vnode_if.c @@ -1,4 +1,4 @@ -/* $NetBSD: vnode_if.c,v 1.66 2006/07/13 12:00:25 martin Exp $ */ +/* $NetBSD: vnode_if.c,v 1.67 2006/11/30 21:07:36 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.50 2006/05/14 21:15:12 elad Exp * by the script: - * NetBSD: vnode_if.sh,v 1.42 2006/05/14 21:15:12 elad Exp + * NetBSD: vnode_if.sh,v 1.43 2006/11/30 21:06:29 pooka Exp */ /* @@ -40,7 +40,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.66 2006/07/13 12:00:25 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.67 2006/11/30 21:07:36 pooka Exp $"); /* @@ -73,7 +73,7 @@ const int vop_bwrite_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_bwrite_desc = { - 1, + VOP_BWRITE_DESCOFFSET, "vop_bwrite", 0, vop_bwrite_vp_offsets, @@ -101,7 +101,7 @@ const int vop_lookup_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_lookup_desc = { - 2, + VOP_LOOKUP_DESCOFFSET, "vop_lookup", 0, vop_lookup_vp_offsets, @@ -131,7 +131,7 @@ const int vop_create_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_create_desc = { - 3, + VOP_CREATE_DESCOFFSET, "vop_create", 0 | VDESC_VP0_WILLPUT, vop_create_vp_offsets, @@ -169,7 +169,7 @@ const int vop_mknod_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_mknod_desc = { - 4, + VOP_MKNOD_DESCOFFSET, "vop_mknod", 0 | VDESC_VP0_WILLPUT, vop_mknod_vp_offsets, @@ -207,7 +207,7 @@ const int vop_open_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_open_desc = { - 5, + VOP_OPEN_DESCOFFSET, "vop_open", 0, vop_open_vp_offsets, @@ -245,7 +245,7 @@ const int vop_close_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_close_desc = { - 6, + VOP_CLOSE_DESCOFFSET, "vop_close", 0, vop_close_vp_offsets, @@ -283,7 +283,7 @@ const int vop_access_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_access_desc = { - 7, + VOP_ACCESS_DESCOFFSET, "vop_access", 0, vop_access_vp_offsets, @@ -321,7 +321,7 @@ const int vop_getattr_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_getattr_desc = { - 8, + VOP_GETATTR_DESCOFFSET, "vop_getattr", 0, vop_getattr_vp_offsets, @@ -353,7 +353,7 @@ const int vop_setattr_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_setattr_desc = { - 9, + VOP_SETATTR_DESCOFFSET, "vop_setattr", 0, vop_setattr_vp_offsets, @@ -391,7 +391,7 @@ const int vop_read_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_read_desc = { - 10, + VOP_READ_DESCOFFSET, "vop_read", 0, vop_read_vp_offsets, @@ -429,7 +429,7 @@ const int vop_write_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_write_desc = { - 11, + VOP_WRITE_DESCOFFSET, "vop_write", 0, vop_write_vp_offsets, @@ -467,7 +467,7 @@ const int vop_ioctl_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_ioctl_desc = { - 12, + VOP_IOCTL_DESCOFFSET, "vop_ioctl", 0, vop_ioctl_vp_offsets, @@ -509,7 +509,7 @@ const int vop_fcntl_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_fcntl_desc = { - 13, + VOP_FCNTL_DESCOFFSET, "vop_fcntl", 0, vop_fcntl_vp_offsets, @@ -551,7 +551,7 @@ const int vop_poll_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_poll_desc = { - 14, + VOP_POLL_DESCOFFSET, "vop_poll", 0, vop_poll_vp_offsets, @@ -587,7 +587,7 @@ const int vop_kqfilter_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_kqfilter_desc = { - 15, + VOP_KQFILTER_DESCOFFSET, "vop_kqfilter", 0, vop_kqfilter_vp_offsets, @@ -621,7 +621,7 @@ const int vop_revoke_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_revoke_desc = { - 16, + VOP_REVOKE_DESCOFFSET, "vop_revoke", 0, vop_revoke_vp_offsets, @@ -655,7 +655,7 @@ const int vop_mmap_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_mmap_desc = { - 17, + VOP_MMAP_DESCOFFSET, "vop_mmap", 0, vop_mmap_vp_offsets, @@ -687,7 +687,7 @@ const int vop_fsync_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_fsync_desc = { - 18, + VOP_FSYNC_DESCOFFSET, "vop_fsync", 0, vop_fsync_vp_offsets, @@ -729,7 +729,7 @@ const int vop_seek_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_seek_desc = { - 19, + VOP_SEEK_DESCOFFSET, "vop_seek", 0, vop_seek_vp_offsets, @@ -762,7 +762,7 @@ const int vop_remove_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_remove_desc = { - 20, + VOP_REMOVE_DESCOFFSET, "vop_remove", 0 | VDESC_VP0_WILLPUT | VDESC_VP1_WILLPUT, vop_remove_vp_offsets, @@ -805,7 +805,7 @@ const int vop_link_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_link_desc = { - 21, + VOP_LINK_DESCOFFSET, "vop_link", 0 | VDESC_VP0_WILLPUT, vop_link_vp_offsets, @@ -850,7 +850,7 @@ const int vop_rename_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_rename_desc = { - 22, + VOP_RENAME_DESCOFFSET, "vop_rename", 0 | VDESC_VP0_WILLRELE | VDESC_VP1_WILLRELE | VDESC_VP2_WILLPUT | VDESC_VP3_WILLPUT, vop_rename_vp_offsets, @@ -904,7 +904,7 @@ const int vop_mkdir_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_mkdir_desc = { - 23, + VOP_MKDIR_DESCOFFSET, "vop_mkdir", 0 | VDESC_VP0_WILLPUT, vop_mkdir_vp_offsets, @@ -943,7 +943,7 @@ const int vop_rmdir_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_rmdir_desc = { - 24, + VOP_RMDIR_DESCOFFSET, "vop_rmdir", 0 | VDESC_VP0_WILLPUT | VDESC_VP1_WILLPUT, vop_rmdir_vp_offsets, @@ -985,7 +985,7 @@ const int vop_symlink_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_symlink_desc = { - 25, + VOP_SYMLINK_DESCOFFSET, "vop_symlink", 0 | VDESC_VP0_WILLPUT, vop_symlink_vp_offsets, @@ -1025,7 +1025,7 @@ const int vop_readdir_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_readdir_desc = { - 26, + VOP_READDIR_DESCOFFSET, "vop_readdir", 0, vop_readdir_vp_offsets, @@ -1067,7 +1067,7 @@ const int vop_readlink_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_readlink_desc = { - 27, + VOP_READLINK_DESCOFFSET, "vop_readlink", 0, vop_readlink_vp_offsets, @@ -1103,7 +1103,7 @@ const int vop_abortop_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_abortop_desc = { - 28, + VOP_ABORTOP_DESCOFFSET, "vop_abortop", 0, vop_abortop_vp_offsets, @@ -1131,7 +1131,7 @@ const int vop_inactive_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_inactive_desc = { - 29, + VOP_INACTIVE_DESCOFFSET, "vop_inactive", 0 | VDESC_VP0_WILLUNLOCK, vop_inactive_vp_offsets, @@ -1165,7 +1165,7 @@ const int vop_reclaim_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_reclaim_desc = { - 30, + VOP_RECLAIM_DESCOFFSET, "vop_reclaim", 0, vop_reclaim_vp_offsets, @@ -1199,7 +1199,7 @@ const int vop_lock_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_lock_desc = { - 31, + VOP_LOCK_DESCOFFSET, "vop_lock", 0, vop_lock_vp_offsets, @@ -1233,7 +1233,7 @@ const int vop_unlock_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_unlock_desc = { - 32, + VOP_UNLOCK_DESCOFFSET, "vop_unlock", 0, vop_unlock_vp_offsets, @@ -1267,7 +1267,7 @@ const int vop_bmap_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_bmap_desc = { - 33, + VOP_BMAP_DESCOFFSET, "vop_bmap", 0, vop_bmap_vp_offsets, @@ -1301,7 +1301,7 @@ const int vop_strategy_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_strategy_desc = { - 34, + VOP_STRATEGY_DESCOFFSET, "vop_strategy", 0, vop_strategy_vp_offsets, @@ -1329,7 +1329,7 @@ const int vop_print_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_print_desc = { - 35, + VOP_PRINT_DESCOFFSET, "vop_print", 0, vop_print_vp_offsets, @@ -1355,7 +1355,7 @@ const int vop_islocked_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_islocked_desc = { - 36, + VOP_ISLOCKED_DESCOFFSET, "vop_islocked", 0, vop_islocked_vp_offsets, @@ -1381,7 +1381,7 @@ const int vop_pathconf_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_pathconf_desc = { - 37, + VOP_PATHCONF_DESCOFFSET, "vop_pathconf", 0, vop_pathconf_vp_offsets, @@ -1417,7 +1417,7 @@ const int vop_advlock_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_advlock_desc = { - 38, + VOP_ADVLOCK_DESCOFFSET, "vop_advlock", 0, vop_advlock_vp_offsets, @@ -1457,7 +1457,7 @@ const int vop_lease_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_lease_desc = { - 39, + VOP_LEASE_DESCOFFSET, "vop_lease", 0, vop_lease_vp_offsets, @@ -1489,7 +1489,7 @@ const int vop_whiteout_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_whiteout_desc = { - 40, + VOP_WHITEOUT_DESCOFFSET, "vop_whiteout", 0, vop_whiteout_vp_offsets, @@ -1525,7 +1525,7 @@ const int vop_getpages_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_getpages_desc = { - 41, + VOP_GETPAGES_DESCOFFSET, "vop_getpages", 0, vop_getpages_vp_offsets, @@ -1565,7 +1565,7 @@ const int vop_putpages_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_putpages_desc = { - 42, + VOP_PUTPAGES_DESCOFFSET, "vop_putpages", 0, vop_putpages_vp_offsets, @@ -1597,7 +1597,7 @@ const int vop_closeextattr_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_closeextattr_desc = { - 43, + VOP_CLOSEEXTATTR_DESCOFFSET, "vop_closeextattr", 0, vop_closeextattr_vp_offsets, @@ -1635,7 +1635,7 @@ const int vop_getextattr_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_getextattr_desc = { - 44, + VOP_GETEXTATTR_DESCOFFSET, "vop_getextattr", 0, vop_getextattr_vp_offsets, @@ -1679,7 +1679,7 @@ const int vop_listextattr_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_listextattr_desc = { - 45, + VOP_LISTEXTATTR_DESCOFFSET, "vop_listextattr", 0, vop_listextattr_vp_offsets, @@ -1721,7 +1721,7 @@ const int vop_openextattr_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_openextattr_desc = { - 46, + VOP_OPENEXTATTR_DESCOFFSET, "vop_openextattr", 0, vop_openextattr_vp_offsets, @@ -1757,7 +1757,7 @@ const int vop_deleteextattr_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_deleteextattr_desc = { - 47, + VOP_DELETEEXTATTR_DESCOFFSET, "vop_deleteextattr", 0, vop_deleteextattr_vp_offsets, @@ -1797,7 +1797,7 @@ const int vop_setextattr_vp_offsets[] = { VDESC_NO_OFFSET }; const struct vnodeop_desc vop_setextattr_desc = { - 48, + VOP_SETEXTATTR_DESCOFFSET, "vop_setextattr", 0, vop_setextattr_vp_offsets, diff --git a/sys/sys/vnode_if.h b/sys/sys/vnode_if.h index 7ae6a828ec5d..cec80447f48b 100644 --- a/sys/sys/vnode_if.h +++ b/sys/sys/vnode_if.h @@ -1,4 +1,4 @@ -/* $NetBSD: vnode_if.h,v 1.62 2006/07/13 12:00:26 martin Exp $ */ +/* $NetBSD: vnode_if.h,v 1.63 2006/11/30 21:07:36 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.50 2006/05/14 21:15:12 elad Exp * by the script: - * NetBSD: vnode_if.sh,v 1.42 2006/05/14 21:15:12 elad Exp + * NetBSD: vnode_if.sh,v 1.43 2006/11/30 21:06:29 pooka Exp */ /* @@ -49,6 +49,19 @@ extern const struct vnodeop_desc vop_default_desc; +/* Special cases: */ +#include + +#define VOP_BWRITE_DESCOFFSET 1 +struct vop_bwrite_args { + const struct vnodeop_desc *a_desc; + struct buf *a_bp; +}; +extern const struct vnodeop_desc vop_bwrite_desc; +int VOP_BWRITE(struct buf *); +/* End of special cases */ + +#define VOP_LOOKUP_DESCOFFSET 2 struct vop_lookup_args { const struct vnodeop_desc *a_desc; struct vnode *a_dvp; @@ -58,6 +71,7 @@ struct vop_lookup_args { extern const struct vnodeop_desc vop_lookup_desc; int VOP_LOOKUP(struct vnode *, struct vnode **, struct componentname *); +#define VOP_CREATE_DESCOFFSET 3 struct vop_create_args { const struct vnodeop_desc *a_desc; struct vnode *a_dvp; @@ -69,6 +83,7 @@ extern const struct vnodeop_desc vop_create_desc; int VOP_CREATE(struct vnode *, struct vnode **, struct componentname *, struct vattr *); +#define VOP_MKNOD_DESCOFFSET 4 struct vop_mknod_args { const struct vnodeop_desc *a_desc; struct vnode *a_dvp; @@ -80,6 +95,7 @@ extern const struct vnodeop_desc vop_mknod_desc; int VOP_MKNOD(struct vnode *, struct vnode **, struct componentname *, struct vattr *); +#define VOP_OPEN_DESCOFFSET 5 struct vop_open_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -90,6 +106,7 @@ struct vop_open_args { extern const struct vnodeop_desc vop_open_desc; int VOP_OPEN(struct vnode *, int, kauth_cred_t, struct lwp *); +#define VOP_CLOSE_DESCOFFSET 6 struct vop_close_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -100,6 +117,7 @@ struct vop_close_args { extern const struct vnodeop_desc vop_close_desc; int VOP_CLOSE(struct vnode *, int, kauth_cred_t, struct lwp *); +#define VOP_ACCESS_DESCOFFSET 7 struct vop_access_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -110,6 +128,7 @@ struct vop_access_args { extern const struct vnodeop_desc vop_access_desc; int VOP_ACCESS(struct vnode *, int, kauth_cred_t, struct lwp *); +#define VOP_GETATTR_DESCOFFSET 8 struct vop_getattr_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -120,6 +139,7 @@ struct vop_getattr_args { extern const struct vnodeop_desc vop_getattr_desc; int VOP_GETATTR(struct vnode *, struct vattr *, kauth_cred_t, struct lwp *); +#define VOP_SETATTR_DESCOFFSET 9 struct vop_setattr_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -130,6 +150,7 @@ struct vop_setattr_args { extern const struct vnodeop_desc vop_setattr_desc; int VOP_SETATTR(struct vnode *, struct vattr *, kauth_cred_t, struct lwp *); +#define VOP_READ_DESCOFFSET 10 struct vop_read_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -140,6 +161,7 @@ struct vop_read_args { extern const struct vnodeop_desc vop_read_desc; int VOP_READ(struct vnode *, struct uio *, int, kauth_cred_t); +#define VOP_WRITE_DESCOFFSET 11 struct vop_write_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -150,6 +172,7 @@ struct vop_write_args { extern const struct vnodeop_desc vop_write_desc; int VOP_WRITE(struct vnode *, struct uio *, int, kauth_cred_t); +#define VOP_IOCTL_DESCOFFSET 12 struct vop_ioctl_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -162,6 +185,7 @@ struct vop_ioctl_args { extern const struct vnodeop_desc vop_ioctl_desc; int VOP_IOCTL(struct vnode *, u_long, void *, int, kauth_cred_t, struct lwp *); +#define VOP_FCNTL_DESCOFFSET 13 struct vop_fcntl_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -174,6 +198,7 @@ struct vop_fcntl_args { extern const struct vnodeop_desc vop_fcntl_desc; int VOP_FCNTL(struct vnode *, u_int, void *, int, kauth_cred_t, struct lwp *); +#define VOP_POLL_DESCOFFSET 14 struct vop_poll_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -183,6 +208,7 @@ struct vop_poll_args { extern const struct vnodeop_desc vop_poll_desc; int VOP_POLL(struct vnode *, int, struct lwp *); +#define VOP_KQFILTER_DESCOFFSET 15 struct vop_kqfilter_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -191,6 +217,7 @@ struct vop_kqfilter_args { extern const struct vnodeop_desc vop_kqfilter_desc; int VOP_KQFILTER(struct vnode *, struct knote *); +#define VOP_REVOKE_DESCOFFSET 16 struct vop_revoke_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -199,6 +226,7 @@ struct vop_revoke_args { extern const struct vnodeop_desc vop_revoke_desc; int VOP_REVOKE(struct vnode *, int); +#define VOP_MMAP_DESCOFFSET 17 struct vop_mmap_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -209,6 +237,7 @@ struct vop_mmap_args { extern const struct vnodeop_desc vop_mmap_desc; int VOP_MMAP(struct vnode *, int, kauth_cred_t, struct lwp *); +#define VOP_FSYNC_DESCOFFSET 18 struct vop_fsync_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -221,6 +250,7 @@ struct vop_fsync_args { extern const struct vnodeop_desc vop_fsync_desc; int VOP_FSYNC(struct vnode *, kauth_cred_t, int, off_t, off_t, struct lwp *); +#define VOP_SEEK_DESCOFFSET 19 struct vop_seek_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -231,6 +261,7 @@ struct vop_seek_args { extern const struct vnodeop_desc vop_seek_desc; int VOP_SEEK(struct vnode *, off_t, off_t, kauth_cred_t); +#define VOP_REMOVE_DESCOFFSET 20 struct vop_remove_args { const struct vnodeop_desc *a_desc; struct vnode *a_dvp; @@ -240,6 +271,7 @@ struct vop_remove_args { extern const struct vnodeop_desc vop_remove_desc; int VOP_REMOVE(struct vnode *, struct vnode *, struct componentname *); +#define VOP_LINK_DESCOFFSET 21 struct vop_link_args { const struct vnodeop_desc *a_desc; struct vnode *a_dvp; @@ -249,6 +281,7 @@ struct vop_link_args { extern const struct vnodeop_desc vop_link_desc; int VOP_LINK(struct vnode *, struct vnode *, struct componentname *); +#define VOP_RENAME_DESCOFFSET 22 struct vop_rename_args { const struct vnodeop_desc *a_desc; struct vnode *a_fdvp; @@ -262,6 +295,7 @@ extern const struct vnodeop_desc vop_rename_desc; int VOP_RENAME(struct vnode *, struct vnode *, struct componentname *, struct vnode *, struct vnode *, struct componentname *); +#define VOP_MKDIR_DESCOFFSET 23 struct vop_mkdir_args { const struct vnodeop_desc *a_desc; struct vnode *a_dvp; @@ -273,6 +307,7 @@ extern const struct vnodeop_desc vop_mkdir_desc; int VOP_MKDIR(struct vnode *, struct vnode **, struct componentname *, struct vattr *); +#define VOP_RMDIR_DESCOFFSET 24 struct vop_rmdir_args { const struct vnodeop_desc *a_desc; struct vnode *a_dvp; @@ -282,6 +317,7 @@ struct vop_rmdir_args { extern const struct vnodeop_desc vop_rmdir_desc; int VOP_RMDIR(struct vnode *, struct vnode *, struct componentname *); +#define VOP_SYMLINK_DESCOFFSET 25 struct vop_symlink_args { const struct vnodeop_desc *a_desc; struct vnode *a_dvp; @@ -294,6 +330,7 @@ extern const struct vnodeop_desc vop_symlink_desc; int VOP_SYMLINK(struct vnode *, struct vnode **, struct componentname *, struct vattr *, char *); +#define VOP_READDIR_DESCOFFSET 26 struct vop_readdir_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -307,6 +344,7 @@ extern const struct vnodeop_desc vop_readdir_desc; int VOP_READDIR(struct vnode *, struct uio *, kauth_cred_t, int *, off_t **, int *); +#define VOP_READLINK_DESCOFFSET 27 struct vop_readlink_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -316,6 +354,7 @@ struct vop_readlink_args { extern const struct vnodeop_desc vop_readlink_desc; int VOP_READLINK(struct vnode *, struct uio *, kauth_cred_t); +#define VOP_ABORTOP_DESCOFFSET 28 struct vop_abortop_args { const struct vnodeop_desc *a_desc; struct vnode *a_dvp; @@ -324,6 +363,7 @@ struct vop_abortop_args { extern const struct vnodeop_desc vop_abortop_desc; int VOP_ABORTOP(struct vnode *, struct componentname *); +#define VOP_INACTIVE_DESCOFFSET 29 struct vop_inactive_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -332,6 +372,7 @@ struct vop_inactive_args { extern const struct vnodeop_desc vop_inactive_desc; int VOP_INACTIVE(struct vnode *, struct lwp *); +#define VOP_RECLAIM_DESCOFFSET 30 struct vop_reclaim_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -340,6 +381,7 @@ struct vop_reclaim_args { extern const struct vnodeop_desc vop_reclaim_desc; int VOP_RECLAIM(struct vnode *, struct lwp *); +#define VOP_LOCK_DESCOFFSET 31 struct vop_lock_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -348,6 +390,7 @@ struct vop_lock_args { extern const struct vnodeop_desc vop_lock_desc; int VOP_LOCK(struct vnode *, int); +#define VOP_UNLOCK_DESCOFFSET 32 struct vop_unlock_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -356,6 +399,7 @@ struct vop_unlock_args { extern const struct vnodeop_desc vop_unlock_desc; int VOP_UNLOCK(struct vnode *, int); +#define VOP_BMAP_DESCOFFSET 33 struct vop_bmap_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -367,6 +411,7 @@ struct vop_bmap_args { extern const struct vnodeop_desc vop_bmap_desc; int VOP_BMAP(struct vnode *, daddr_t, struct vnode **, daddr_t *, int *); +#define VOP_STRATEGY_DESCOFFSET 34 struct vop_strategy_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -375,6 +420,7 @@ struct vop_strategy_args { extern const struct vnodeop_desc vop_strategy_desc; int VOP_STRATEGY(struct vnode *, struct buf *); +#define VOP_PRINT_DESCOFFSET 35 struct vop_print_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -382,6 +428,7 @@ struct vop_print_args { extern const struct vnodeop_desc vop_print_desc; int VOP_PRINT(struct vnode *); +#define VOP_ISLOCKED_DESCOFFSET 36 struct vop_islocked_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -389,6 +436,7 @@ struct vop_islocked_args { extern const struct vnodeop_desc vop_islocked_desc; int VOP_ISLOCKED(struct vnode *); +#define VOP_PATHCONF_DESCOFFSET 37 struct vop_pathconf_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -398,6 +446,7 @@ struct vop_pathconf_args { extern const struct vnodeop_desc vop_pathconf_desc; int VOP_PATHCONF(struct vnode *, int, register_t *); +#define VOP_ADVLOCK_DESCOFFSET 38 struct vop_advlock_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -409,6 +458,7 @@ struct vop_advlock_args { extern const struct vnodeop_desc vop_advlock_desc; int VOP_ADVLOCK(struct vnode *, void *, int, struct flock *, int); +#define VOP_LEASE_DESCOFFSET 39 struct vop_lease_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -419,6 +469,7 @@ struct vop_lease_args { extern const struct vnodeop_desc vop_lease_desc; int VOP_LEASE(struct vnode *, struct lwp *, kauth_cred_t, int); +#define VOP_WHITEOUT_DESCOFFSET 40 struct vop_whiteout_args { const struct vnodeop_desc *a_desc; struct vnode *a_dvp; @@ -428,6 +479,7 @@ struct vop_whiteout_args { extern const struct vnodeop_desc vop_whiteout_desc; int VOP_WHITEOUT(struct vnode *, struct componentname *, int); +#define VOP_GETPAGES_DESCOFFSET 41 struct vop_getpages_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -443,6 +495,7 @@ extern const struct vnodeop_desc vop_getpages_desc; int VOP_GETPAGES(struct vnode *, voff_t, struct vm_page **, int *, int, vm_prot_t, int, int); +#define VOP_PUTPAGES_DESCOFFSET 42 struct vop_putpages_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -453,6 +506,7 @@ struct vop_putpages_args { extern const struct vnodeop_desc vop_putpages_desc; int VOP_PUTPAGES(struct vnode *, voff_t, voff_t, int); +#define VOP_CLOSEEXTATTR_DESCOFFSET 43 struct vop_closeextattr_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -463,6 +517,7 @@ struct vop_closeextattr_args { extern const struct vnodeop_desc vop_closeextattr_desc; int VOP_CLOSEEXTATTR(struct vnode *, int, kauth_cred_t, struct lwp *); +#define VOP_GETEXTATTR_DESCOFFSET 44 struct vop_getextattr_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -477,6 +532,7 @@ extern const struct vnodeop_desc vop_getextattr_desc; int VOP_GETEXTATTR(struct vnode *, int, const char *, struct uio *, size_t *, kauth_cred_t, struct lwp *); +#define VOP_LISTEXTATTR_DESCOFFSET 45 struct vop_listextattr_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -490,6 +546,7 @@ extern const struct vnodeop_desc vop_listextattr_desc; int VOP_LISTEXTATTR(struct vnode *, int, struct uio *, size_t *, kauth_cred_t, struct lwp *); +#define VOP_OPENEXTATTR_DESCOFFSET 46 struct vop_openextattr_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -499,6 +556,7 @@ struct vop_openextattr_args { extern const struct vnodeop_desc vop_openextattr_desc; int VOP_OPENEXTATTR(struct vnode *, kauth_cred_t, struct lwp *); +#define VOP_DELETEEXTATTR_DESCOFFSET 47 struct vop_deleteextattr_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -511,6 +569,7 @@ extern const struct vnodeop_desc vop_deleteextattr_desc; int VOP_DELETEEXTATTR(struct vnode *, int, const char *, kauth_cred_t, struct lwp *); +#define VOP_SETEXTATTR_DESCOFFSET 48 struct vop_setextattr_args { const struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -524,16 +583,6 @@ extern const struct vnodeop_desc vop_setextattr_desc; int VOP_SETEXTATTR(struct vnode *, int, const char *, struct uio *, kauth_cred_t, struct lwp *); -/* Special cases: */ -#include - -struct vop_bwrite_args { - const struct vnodeop_desc *a_desc; - struct buf *a_bp; -}; -extern const struct vnodeop_desc vop_bwrite_desc; -int VOP_BWRITE(struct buf *); - #define VNODE_OPS_COUNT 49 /* End of special cases. */