diff options
| -rw-r--r-- | sys/kern/vnode_if.c | 286 | ||||
| -rw-r--r-- | sys/sys/vnode_if.h | 86 |
2 files changed, 2 insertions, 370 deletions
diff --git a/sys/kern/vnode_if.c b/sys/kern/vnode_if.c index d6ada387daa..1f30d85c507 100644 --- a/sys/kern/vnode_if.c +++ b/sys/kern/vnode_if.c @@ -3,7 +3,7 @@ * (Modifications made here may easily be lost!) * * Created from the file: - * OpenBSD: vnode_if.src,v 1.10 2001/03/01 20:54:34 provos Exp + * OpenBSD: vnode_if.src,v 1.11 2001/06/23 02:21:05 csapuntz Exp * by the script: * OpenBSD: vnode_if.sh,v 1.8 2001/02/26 17:34:18 art Exp */ @@ -568,37 +568,6 @@ int VOP_REVOKE(vp, flags) return (VCALL(vp, VOFFSET(vop_revoke), &a)); } -int vop_mmap_vp_offsets[] = { - VOPARG_OFFSETOF(struct vop_mmap_args,a_vp), - VDESC_NO_OFFSET -}; -struct vnodeop_desc vop_mmap_desc = { - 0, - "vop_mmap", - 0, - vop_mmap_vp_offsets, - VDESC_NO_OFFSET, - VOPARG_OFFSETOF(struct vop_mmap_args, a_cred), - VOPARG_OFFSETOF(struct vop_mmap_args, a_p), - VDESC_NO_OFFSET, - NULL, -}; - -int VOP_MMAP(vp, fflags, cred, p) - struct vnode *vp; - int fflags; - struct ucred *cred; - struct proc *p; -{ - struct vop_mmap_args a; - a.a_desc = VDESC(vop_mmap); - a.a_vp = vp; - a.a_fflags = fflags; - a.a_cred = cred; - a.a_p = p; - return (VCALL(vp, VOFFSET(vop_mmap), &a)); -} - int vop_fsync_vp_offsets[] = { VOPARG_OFFSETOF(struct vop_fsync_args,a_vp), VDESC_NO_OFFSET @@ -634,37 +603,6 @@ int VOP_FSYNC(vp, cred, waitfor, p) return (VCALL(vp, VOFFSET(vop_fsync), &a)); } -int vop_seek_vp_offsets[] = { - VOPARG_OFFSETOF(struct vop_seek_args,a_vp), - VDESC_NO_OFFSET -}; -struct vnodeop_desc vop_seek_desc = { - 0, - "vop_seek", - 0, - vop_seek_vp_offsets, - VDESC_NO_OFFSET, - VOPARG_OFFSETOF(struct vop_seek_args, a_cred), - VDESC_NO_OFFSET, - VDESC_NO_OFFSET, - NULL, -}; - -int VOP_SEEK(vp, oldoff, newoff, cred) - struct vnode *vp; - off_t oldoff; - off_t newoff; - struct ucred *cred; -{ - struct vop_seek_args a; - a.a_desc = VDESC(vop_seek); - a.a_vp = vp; - a.a_oldoff = oldoff; - a.a_newoff = newoff; - a.a_cred = cred; - return (VCALL(vp, VOFFSET(vop_seek), &a)); -} - int vop_remove_vp_offsets[] = { VOPARG_OFFSETOF(struct vop_remove_args,a_dvp), VOPARG_OFFSETOF(struct vop_remove_args,a_vp), @@ -1228,115 +1166,6 @@ int VOP_ADVLOCK(vp, id, op, fl, flags) return (VCALL(vp, VOFFSET(vop_advlock), &a)); } -int vop_blkatoff_vp_offsets[] = { - VOPARG_OFFSETOF(struct vop_blkatoff_args,a_vp), - VDESC_NO_OFFSET -}; -struct vnodeop_desc vop_blkatoff_desc = { - 0, - "vop_blkatoff", - 0, - vop_blkatoff_vp_offsets, - VDESC_NO_OFFSET, - VDESC_NO_OFFSET, - VDESC_NO_OFFSET, - VDESC_NO_OFFSET, - NULL, -}; - -int VOP_BLKATOFF(vp, offset, res, bpp) - struct vnode *vp; - off_t offset; - char **res; - struct buf **bpp; -{ - struct vop_blkatoff_args a; - a.a_desc = VDESC(vop_blkatoff); - a.a_vp = vp; -#ifdef LOCKDEBUG - 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; - return (VCALL(vp, VOFFSET(vop_blkatoff), &a)); -} - -int vop_valloc_vp_offsets[] = { - VOPARG_OFFSETOF(struct vop_valloc_args,a_pvp), - VDESC_NO_OFFSET -}; -struct vnodeop_desc vop_valloc_desc = { - 0, - "vop_valloc", - 0, - vop_valloc_vp_offsets, - VOPARG_OFFSETOF(struct vop_valloc_args, a_vpp), - VOPARG_OFFSETOF(struct vop_valloc_args, a_cred), - VDESC_NO_OFFSET, - VDESC_NO_OFFSET, - NULL, -}; - -int VOP_VALLOC(pvp, mode, cred, vpp) - struct vnode *pvp; - int mode; - struct ucred *cred; - struct vnode **vpp; -{ - struct vop_valloc_args a; - a.a_desc = VDESC(vop_valloc); - a.a_pvp = pvp; -#ifdef LOCKDEBUG - 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; - return (VCALL(pvp, VOFFSET(vop_valloc), &a)); -} - -int vop_balloc_vp_offsets[] = { - VOPARG_OFFSETOF(struct vop_balloc_args,a_vp), - VDESC_NO_OFFSET -}; -struct vnodeop_desc vop_balloc_desc = { - 0, - "vop_balloc", - 0, - vop_balloc_vp_offsets, - VDESC_NO_OFFSET, - VOPARG_OFFSETOF(struct vop_balloc_args, a_cred), - VDESC_NO_OFFSET, - VDESC_NO_OFFSET, - NULL, -}; - -int VOP_BALLOC(vp, startoffset, size, cred, flags, bpp) - struct vnode *vp; - off_t startoffset; - int size; - struct ucred *cred; - int flags; - struct buf **bpp; -{ - struct vop_balloc_args a; - a.a_desc = VDESC(vop_balloc); - a.a_vp = vp; -#ifdef LOCKDEBUG - 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; - a.a_flags = flags; - a.a_bpp = bpp; - return (VCALL(vp, VOFFSET(vop_balloc), &a)); -} - int vop_reallocblks_vp_offsets[] = { VOPARG_OFFSETOF(struct vop_reallocblks_args,a_vp), VDESC_NO_OFFSET @@ -1368,111 +1197,6 @@ int VOP_REALLOCBLKS(vp, buflist) return (VCALL(vp, VOFFSET(vop_reallocblks), &a)); } -int vop_vfree_vp_offsets[] = { - VOPARG_OFFSETOF(struct vop_vfree_args,a_pvp), - VDESC_NO_OFFSET -}; -struct vnodeop_desc vop_vfree_desc = { - 0, - "vop_vfree", - 0, - vop_vfree_vp_offsets, - VDESC_NO_OFFSET, - VDESC_NO_OFFSET, - VDESC_NO_OFFSET, - VDESC_NO_OFFSET, - NULL, -}; - -int VOP_VFREE(pvp, ino, mode) - struct vnode *pvp; - ino_t ino; - int mode; -{ - struct vop_vfree_args a; - a.a_desc = VDESC(vop_vfree); - a.a_pvp = pvp; -#ifdef LOCKDEBUG - 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)); -} - -int vop_truncate_vp_offsets[] = { - VOPARG_OFFSETOF(struct vop_truncate_args,a_vp), - VDESC_NO_OFFSET -}; -struct vnodeop_desc vop_truncate_desc = { - 0, - "vop_truncate", - 0, - vop_truncate_vp_offsets, - VDESC_NO_OFFSET, - VOPARG_OFFSETOF(struct vop_truncate_args, a_cred), - VOPARG_OFFSETOF(struct vop_truncate_args, a_p), - VDESC_NO_OFFSET, - NULL, -}; - -int VOP_TRUNCATE(vp, length, flags, cred, p) - struct vnode *vp; - off_t length; - int flags; - struct ucred *cred; - struct proc *p; -{ - struct vop_truncate_args a; - a.a_desc = VDESC(vop_truncate); - a.a_vp = vp; -#ifdef LOCKDEBUG - 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; - a.a_p = p; - return (VCALL(vp, VOFFSET(vop_truncate), &a)); -} - -int vop_update_vp_offsets[] = { - VOPARG_OFFSETOF(struct vop_update_args,a_vp), - VDESC_NO_OFFSET -}; -struct vnodeop_desc vop_update_desc = { - 0, - "vop_update", - 0, - vop_update_vp_offsets, - VDESC_NO_OFFSET, - VDESC_NO_OFFSET, - VDESC_NO_OFFSET, - VDESC_NO_OFFSET, - NULL, -}; - -int VOP_UPDATE(vp, access, modify, waitfor) - struct vnode *vp; - struct timespec *access; - struct timespec *modify; - int waitfor; -{ - struct vop_update_args a; - a.a_desc = VDESC(vop_update); - a.a_vp = vp; -#ifdef LOCKDEBUG - 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; - return (VCALL(vp, VOFFSET(vop_update), &a)); -} - int vop_whiteout_vp_offsets[] = { VOPARG_OFFSETOF(struct vop_whiteout_args,a_dvp), VDESC_NO_OFFSET @@ -1579,9 +1303,7 @@ struct vnodeop_desc *vfs_op_descs[] = { &vop_select_desc, &vop_kqfilter_desc, &vop_revoke_desc, - &vop_mmap_desc, &vop_fsync_desc, - &vop_seek_desc, &vop_remove_desc, &vop_link_desc, &vop_rename_desc, @@ -1599,13 +1321,7 @@ struct vnodeop_desc *vfs_op_descs[] = { &vop_print_desc, &vop_pathconf_desc, &vop_advlock_desc, - &vop_blkatoff_desc, - &vop_valloc_desc, - &vop_balloc_desc, &vop_reallocblks_desc, - &vop_vfree_desc, - &vop_truncate_desc, - &vop_update_desc, &vop_whiteout_desc, NULL }; diff --git a/sys/sys/vnode_if.h b/sys/sys/vnode_if.h index 9dfcb5c418a..00cdadabe25 100644 --- a/sys/sys/vnode_if.h +++ b/sys/sys/vnode_if.h @@ -3,7 +3,7 @@ * (Modifications made here may easily be lost!) * * Created from the file: - * OpenBSD: vnode_if.src,v 1.10 2001/03/01 20:54:34 provos Exp + * OpenBSD: vnode_if.src,v 1.11 2001/06/23 02:21:05 csapuntz Exp * by the script: * OpenBSD: vnode_if.sh,v 1.8 2001/02/26 17:34:18 art Exp */ @@ -205,16 +205,6 @@ struct vop_revoke_args { extern struct vnodeop_desc vop_revoke_desc; int VOP_REVOKE __P((struct vnode *, int)); -struct vop_mmap_args { - struct vnodeop_desc *a_desc; - struct vnode *a_vp; - int a_fflags; - struct ucred *a_cred; - struct proc *a_p; -}; -extern struct vnodeop_desc vop_mmap_desc; -int VOP_MMAP __P((struct vnode *, int, struct ucred *, struct proc *)); - struct vop_fsync_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -225,16 +215,6 @@ struct vop_fsync_args { extern struct vnodeop_desc vop_fsync_desc; int VOP_FSYNC __P((struct vnode *, struct ucred *, int, struct proc *)); -struct vop_seek_args { - struct vnodeop_desc *a_desc; - struct vnode *a_vp; - off_t a_oldoff; - off_t a_newoff; - struct ucred *a_cred; -}; -extern struct vnodeop_desc vop_seek_desc; -int VOP_SEEK __P((struct vnode *, off_t, off_t, struct ucred *)); - struct vop_remove_args { struct vnodeop_desc *a_desc; struct vnode *a_dvp; @@ -400,39 +380,6 @@ struct vop_advlock_args { extern struct vnodeop_desc vop_advlock_desc; int VOP_ADVLOCK __P((struct vnode *, caddr_t, int, struct flock *, int)); -struct vop_blkatoff_args { - struct vnodeop_desc *a_desc; - struct vnode *a_vp; - off_t a_offset; - char **a_res; - struct buf **a_bpp; -}; -extern struct vnodeop_desc vop_blkatoff_desc; -int VOP_BLKATOFF __P((struct vnode *, off_t, char **, struct buf **)); - -struct vop_valloc_args { - struct vnodeop_desc *a_desc; - struct vnode *a_pvp; - int a_mode; - struct ucred *a_cred; - struct vnode **a_vpp; -}; -extern struct vnodeop_desc vop_valloc_desc; -int VOP_VALLOC __P((struct vnode *, int, struct ucred *, struct vnode **)); - -struct vop_balloc_args { - struct vnodeop_desc *a_desc; - struct vnode *a_vp; - off_t a_startoffset; - int a_size; - struct ucred *a_cred; - int a_flags; - struct buf **a_bpp; -}; -extern struct vnodeop_desc vop_balloc_desc; -int VOP_BALLOC __P((struct vnode *, off_t, int, struct ucred *, int, - struct buf **)); - struct vop_reallocblks_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -441,37 +388,6 @@ struct vop_reallocblks_args { extern struct vnodeop_desc vop_reallocblks_desc; int VOP_REALLOCBLKS __P((struct vnode *, struct cluster_save *)); -struct vop_vfree_args { - struct vnodeop_desc *a_desc; - struct vnode *a_pvp; - ino_t a_ino; - int a_mode; -}; -extern struct vnodeop_desc vop_vfree_desc; -int VOP_VFREE __P((struct vnode *, ino_t, int)); - -struct vop_truncate_args { - struct vnodeop_desc *a_desc; - struct vnode *a_vp; - off_t a_length; - int a_flags; - struct ucred *a_cred; - struct proc *a_p; -}; -extern struct vnodeop_desc vop_truncate_desc; -int VOP_TRUNCATE __P((struct vnode *, off_t, int, struct ucred *, - struct proc *)); - -struct vop_update_args { - struct vnodeop_desc *a_desc; - struct vnode *a_vp; - struct timespec *a_access; - struct timespec *a_modify; - int a_waitfor; -}; -extern struct vnodeop_desc vop_update_desc; -int VOP_UPDATE __P((struct vnode *, struct timespec *, struct timespec *, int)); - struct vop_whiteout_args { struct vnodeop_desc *a_desc; struct vnode *a_dvp; |