diff options
33 files changed, 278 insertions, 1368 deletions
diff --git a/sys/isofs/cd9660/cd9660_bmap.c b/sys/isofs/cd9660/cd9660_bmap.c index db8404794df..60d48eef5b7 100644 --- a/sys/isofs/cd9660/cd9660_bmap.c +++ b/sys/isofs/cd9660/cd9660_bmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_bmap.c,v 1.4 2003/06/02 23:28:05 millert Exp $ */ +/* $OpenBSD: cd9660_bmap.c,v 1.5 2007/06/01 23:47:55 deraadt Exp $ */ /* $NetBSD: cd9660_bmap.c,v 1.7 1997/01/24 00:27:29 cgd Exp $ */ /*- @@ -57,13 +57,7 @@ int cd9660_bmap(v) void *v; { - struct vop_bmap_args /* { - struct vnode *a_vp; - daddr_t a_bn; - struct vnode **a_vpp; - daddr_t *a_bnp; - int *a_runp; - } */ *ap = v; + struct vop_bmap_args *ap = v; struct iso_node *ip = VTOI(ap->a_vp); daddr_t lblkno = ap->a_bn; int bshift; diff --git a/sys/isofs/cd9660/cd9660_lookup.c b/sys/isofs/cd9660/cd9660_lookup.c index d0bf7cca7d4..51455eef599 100644 --- a/sys/isofs/cd9660/cd9660_lookup.c +++ b/sys/isofs/cd9660/cd9660_lookup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_lookup.c,v 1.12 2006/01/25 21:15:55 mickey Exp $ */ +/* $OpenBSD: cd9660_lookup.c,v 1.13 2007/06/01 23:47:55 deraadt Exp $ */ /* $NetBSD: cd9660_lookup.c,v 1.18 1997/05/08 16:19:59 mycroft Exp $ */ /*- @@ -95,11 +95,7 @@ int cd9660_lookup(v) void *v; { - struct vop_lookup_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - } */ *ap = v; + struct vop_lookup_args *ap = v; register struct vnode *vdp; /* vnode for directory being searched */ register struct iso_node *dp; /* inode for directory being searched */ register struct iso_mnt *imp; /* file system that directory is in */ diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c index 6f97850f4bb..de2e4f59f51 100644 --- a/sys/isofs/cd9660/cd9660_node.c +++ b/sys/isofs/cd9660/cd9660_node.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_node.c,v 1.18 2007/04/11 16:08:50 thib Exp $ */ +/* $OpenBSD: cd9660_node.c,v 1.19 2007/06/01 23:47:55 deraadt Exp $ */ /* $NetBSD: cd9660_node.c,v 1.17 1997/05/05 07:13:57 mycroft Exp $ */ /*- @@ -234,10 +234,7 @@ int cd9660_inactive(v) void *v; { - struct vop_inactive_args /* { - struct vnode *a_vp; - struct proc *a_p; - } */ *ap = v; + struct vop_inactive_args *ap = v; struct vnode *vp = ap->a_vp; struct proc *p = ap->a_p; register struct iso_node *ip = VTOI(vp); @@ -267,9 +264,7 @@ int cd9660_reclaim(v) void *v; { - struct vop_reclaim_args /* { - struct vnode *a_vp; - } */ *ap = v; + struct vop_reclaim_args *ap = v; register struct vnode *vp = ap->a_vp; register struct iso_node *ip = VTOI(vp); diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c index 089d443e2f6..1f00abe8993 100644 --- a/sys/isofs/cd9660/cd9660_vnops.c +++ b/sys/isofs/cd9660/cd9660_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_vnops.c,v 1.41 2007/06/01 22:30:48 deraadt Exp $ */ +/* $OpenBSD: cd9660_vnops.c,v 1.42 2007/06/01 23:47:55 deraadt Exp $ */ /* $NetBSD: cd9660_vnops.c,v 1.42 1997/10/16 23:56:57 christos Exp $ */ /*- @@ -149,13 +149,7 @@ int cd9660_setattr(v) void *v; { - struct vop_setattr_args /* { - struct vnodeop_desc *a_desc; - struct vnode *a_vp; - struct vattr *a_vap; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_setattr_args *ap = v; struct vnode *vp = ap->a_vp; struct vattr *vap = ap->a_vap; @@ -218,12 +212,7 @@ int cd9660_access(v) void *v; { - struct vop_access_args /* { - struct vnode *a_vp; - int a_mode; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_access_args *ap = v; struct iso_node *ip = VTOI(ap->a_vp); return (vaccess(ip->inode.iso_mode & ALLPERMS, ip->inode.iso_uid, @@ -234,12 +223,7 @@ int cd9660_getattr(v) void *v; { - struct vop_getattr_args /* { - struct vnode *a_vp; - struct vattr *a_vap; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_getattr_args *ap = v; struct vnode *vp = ap->a_vp; register struct vattr *vap = ap->a_vap; register struct iso_node *ip = VTOI(vp); @@ -295,12 +279,7 @@ int cd9660_read(v) void *v; { - struct vop_read_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_read_args *ap = v; struct vnode *vp = ap->a_vp; register struct uio *uio = ap->a_uio; register struct iso_node *ip = VTOI(vp); @@ -382,11 +361,7 @@ int cd9660_poll(v) void *v; { - struct vop_poll_args /* { - struct vnode *a_vp; - int a_events; - struct proc *a_p; - } */ *ap = v; + struct vop_poll_args *ap = v; /* * We should really check to see if I/O is possible. @@ -514,14 +489,7 @@ int cd9660_readdir(v) void *v; { - struct vop_readdir_args /* { - struct vnode *a_vp; - struct uio *a_uio; - struct ucred *a_cred; - int *a_eofflag; - u_long *a_cookies; - int a_ncookies; - } */ *ap = v; + struct vop_readdir_args *ap = v; register struct uio *uio = ap->a_uio; struct isoreaddir *idp; struct vnode *vdp = ap->a_vp; @@ -710,11 +678,7 @@ int cd9660_readlink(v) void *v; { - struct vop_readlink_args /* { - struct vnode *a_vp; - struct uio *a_uio; - struct ucred *a_cred; - } */ *ap = v; + struct vop_readlink_args *ap = v; ISONODE *ip; ISODIR *dirp; ISOMNT *imp; @@ -802,11 +766,7 @@ int cd9660_link(v) void *v; { - struct vop_link_args /* { - struct vnode *a_dvp; - struct vnode *a_vp; - struct componentname *a_cnp; - } */ *ap = v; + struct vop_link_args *ap = v; VOP_ABORTOP(ap->a_dvp, ap->a_cnp); vput(ap->a_dvp); @@ -817,13 +777,7 @@ int cd9660_symlink(v) void *v; { - struct vop_symlink_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - struct vattr *a_vap; - char *a_target; - } */ *ap = v; + struct vop_symlink_args *ap = v; VOP_ABORTOP(ap->a_dvp, ap->a_cnp); vput(ap->a_dvp); @@ -837,9 +791,7 @@ int cd9660_lock(v) void *v; { - struct vop_lock_args /* { - struct vnode *a_vp; - } */ *ap = v; + struct vop_lock_args *ap = v; struct vnode *vp = ap->a_vp; return (lockmgr(&VTOI(vp)->i_lock, ap->a_flags, NULL)); @@ -852,9 +804,7 @@ int cd9660_unlock(v) void *v; { - struct vop_unlock_args /* { - struct vnode *a_vp; - } */ *ap = v; + struct vop_unlock_args *ap = v; struct vnode *vp = ap->a_vp; return (lockmgr(&VTOI(vp)->i_lock, ap->a_flags | LK_RELEASE, NULL)); @@ -868,9 +818,7 @@ int cd9660_strategy(v) void *v; { - struct vop_strategy_args /* { - struct buf *a_bp; - } */ *ap = v; + struct vop_strategy_args *ap = v; struct buf *bp = ap->a_bp; struct vnode *vp = bp->b_vp; struct iso_node *ip; @@ -924,9 +872,7 @@ int cd9660_islocked(v) void *v; { - struct vop_islocked_args /* { - struct vnode *a_vp; - } */ *ap = v; + struct vop_islocked_args *ap = v; return (lockstatus(&VTOI(ap->a_vp)->i_lock)); } @@ -938,11 +884,7 @@ int cd9660_pathconf(v) void *v; { - struct vop_pathconf_args /* { - struct vnode *a_vp; - int a_name; - register_t *a_retval; - } */ *ap = v; + struct vop_pathconf_args *ap = v; switch (ap->a_name) { case _PC_LINK_MAX: *ap->a_retval = 1; diff --git a/sys/isofs/udf/udf_vnops.c b/sys/isofs/udf/udf_vnops.c index 4b18031a13e..ea4f2736c02 100644 --- a/sys/isofs/udf/udf_vnops.c +++ b/sys/isofs/udf/udf_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udf_vnops.c,v 1.25 2007/05/09 02:46:12 deraadt Exp $ */ +/* $OpenBSD: udf_vnops.c,v 1.26 2007/06/01 23:47:56 deraadt Exp $ */ /* * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org> @@ -199,12 +199,7 @@ udf_permtomode(struct unode *up) int udf_access(void *v) { - struct vop_access_args /* { - struct vnode *a_vp; - int a_mode; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_access_args *ap = v; struct vnode *vp; struct unode *up; mode_t a_mode, mode; @@ -311,12 +306,7 @@ udf_timetotimespec(struct timestamp *time, struct timespec *t) int udf_getattr(void *v) { - struct vop_getattr_args /* { - struct vnode *a_vp; - struct vattr *v_vap; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_getattr_args *ap = v; struct vnode *vp; struct unode *up; struct vattr *vap; @@ -423,12 +413,7 @@ udf_pathconf(struct vop_pathconf_args *a) int udf_read(void *v) { - struct vop_read_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_read_args *ap = v; struct vnode *vp = ap->a_vp; struct uio *uio = ap->a_uio; struct unode *up = VTOU(vp); @@ -709,14 +694,7 @@ udf_closedir(struct udf_dirstream *ds) int udf_readdir(void *v) { - struct vop_readdir_args /* { - struct vnode *a_vp; - struct uio *a_uio; - struct ucred *a_cred; - int *a_eofflag; - u_long **a_cookies; - int *ncookies; - } */ *ap = v; + struct vop_readdir_args *ap = v; struct vnode *vp; struct uio *uio; struct dirent dir; @@ -850,9 +828,7 @@ udf_readlink(void *v) int udf_strategy(void *v) { - struct vop_strategy_args /* { - struct buf *a_bp; - } */ *ap = v; + struct vop_strategy_args *ap = v; struct buf *bp; struct vnode *vp; struct unode *up; @@ -903,11 +879,7 @@ udf_strategy(void *v) int udf_lock(void *v) { - struct vop_lock_args /* { - struct vnode *a_vp; - int a_flags; - struct proc *a_p; - } */ *ap = v; + struct vop_lock_args *ap = v; struct vnode *vp = ap->a_vp; @@ -917,11 +889,7 @@ udf_lock(void *v) int udf_unlock(void *v) { - struct vop_unlock_args /* { - struct vnode *a_vp; - int a_flags; - struct proc *a_p; - } */ *ap= v; + struct vop_unlock_args *ap = v; struct vnode *vp = ap->a_vp; @@ -931,9 +899,7 @@ udf_unlock(void *v) int udf_islocked(void *v) { - struct vop_islocked_args /* { - struct vnode *a_vp; - } */ *ap = v; + struct vop_islocked_args *ap = v; return (lockstatus(&VTOU(ap->a_vp)->u_lock)); } @@ -941,9 +907,7 @@ udf_islocked(void *v) int udf_print(void *v) { - struct vop_print_args /* { - struct vnode *a_vp; - } */ *ap = v; + struct vop_print_args *ap = v; struct vnode *vp = ap->a_vp; struct unode *up = VTOU(vp); @@ -961,13 +925,7 @@ udf_print(void *v) int udf_bmap(void *v) { - struct vop_bmap_args /* { - struct vnode *a_vp; - daddr_t a_bn; - struct vnode **a_vpp; - daddr_t *a_bnp; - int *a_runp; - } */ *ap = v; + struct vop_bmap_args *ap = v; struct unode *up; uint32_t max_size; daddr64_t lsector; @@ -1001,11 +959,7 @@ udf_bmap(void *v) int udf_lookup(void *v) { - struct vop_lookup_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - } */ *ap = v; + struct vop_lookup_args *ap = v; struct vnode *dvp; struct vnode *tdp = NULL; struct vnode **vpp = ap->a_vpp; @@ -1162,10 +1116,7 @@ lookloop: int udf_inactive(void *v) { - struct vop_inactive_args /* { - struct vnode *a_vp; - struct proc *a_p; - } */ *ap = v; + struct vop_inactive_args *ap = v; struct vnode *vp = ap->a_vp; struct proc *p = ap->a_p; @@ -1180,10 +1131,7 @@ udf_inactive(void *v) int udf_reclaim(void *v) { - struct vop_reclaim_args /* { - struct vnode *a_vp; - struct proc *a_p; - } */ *ap = v; + struct vop_reclaim_args *ap = v; struct vnode *vp; struct unode *up; diff --git a/sys/kern/spec_vnops.c b/sys/kern/spec_vnops.c index f06ee19defe..139cef8871a 100644 --- a/sys/kern/spec_vnops.c +++ b/sys/kern/spec_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spec_vnops.c,v 1.40 2007/05/29 06:28:15 otto Exp $ */ +/* $OpenBSD: spec_vnops.c,v 1.41 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $ */ /* @@ -113,11 +113,7 @@ int spec_lookup(v) void *v; { - struct vop_lookup_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - } */ *ap = v; + struct vop_lookup_args *ap = v; *ap->a_vpp = NULL; return (ENOTDIR); @@ -131,12 +127,7 @@ int spec_open(v) void *v; { - struct vop_open_args /* { - struct vnode *a_vp; - int a_mode; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_open_args *ap = v; struct proc *p = ap->a_p; struct vnode *vp = ap->a_vp; struct vnode *bvp; @@ -225,12 +216,7 @@ int spec_read(v) void *v; { - struct vop_read_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_read_args *ap = v; register struct vnode *vp = ap->a_vp; register struct uio *uio = ap->a_uio; struct proc *p = uio->uio_procp; @@ -307,10 +293,7 @@ int spec_inactive(v) void *v; { - struct vop_inactive_args /* { - struct vnode *a_vp; - struct proc *a_p; - } */ *ap = v; + struct vop_inactive_args *ap = v; VOP_UNLOCK(ap->a_vp, 0, ap->a_p); return (0); @@ -324,12 +307,7 @@ int spec_write(v) void *v; { - struct vop_write_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_write_args *ap = v; register struct vnode *vp = ap->a_vp; register struct uio *uio = ap->a_uio; struct proc *p = uio->uio_procp; @@ -407,14 +385,7 @@ int spec_ioctl(v) void *v; { - struct vop_ioctl_args /* { - struct vnode *a_vp; - u_long a_command; - caddr_t a_data; - int a_fflag; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_ioctl_args *ap = v; dev_t dev = ap->a_vp->v_rdev; int maj = major(dev); @@ -439,11 +410,7 @@ int spec_poll(v) void *v; { - struct vop_poll_args /* { - struct vnode *a_vp; - int a_events; - struct proc *a_p; - } */ *ap = v; + struct vop_poll_args *ap = v; register dev_t dev; switch (ap->a_vp->v_type) { @@ -462,10 +429,7 @@ int spec_kqfilter(v) void *v; { - struct vop_kqfilter_args /* { - struct vnode *a_vp; - struct knote *a_kn; - } */ *ap = v; + struct vop_kqfilter_args *ap = v; dev_t dev; @@ -483,12 +447,7 @@ int spec_fsync(v) void *v; { - struct vop_fsync_args /* { - struct vnode *a_vp; - struct ucred *a_cred; - int a_waitfor; - struct proc *a_p; - } */ *ap = v; + struct vop_fsync_args *ap = v; register struct vnode *vp = ap->a_vp; register struct buf *bp; struct buf *nbp; @@ -533,9 +492,7 @@ int spec_strategy(v) void *v; { - struct vop_strategy_args /* { - struct buf *a_bp; - } */ *ap = v; + struct vop_strategy_args *ap = v; struct buf *bp = ap->a_bp; int maj = major(bp->b_dev); @@ -553,13 +510,7 @@ int spec_bmap(v) void *v; { - struct vop_bmap_args /* { - struct vnode *a_vp; - daddr_t a_bn; - struct vnode **a_vpp; - daddr_t *a_bnp; - int *a_runp; - } */ *ap = v; + struct vop_bmap_args *ap = v; if (ap->a_vpp != NULL) *ap->a_vpp = ap->a_vp; @@ -579,12 +530,7 @@ int spec_close(v) void *v; { - struct vop_close_args /* { - struct vnode *a_vp; - int a_fflag; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_close_args *ap = v; register struct vnode *vp = ap->a_vp; dev_t dev = vp->v_rdev; int (*devclose)(dev_t, int, int, struct proc *); @@ -664,9 +610,7 @@ int spec_print(v) void *v; { - struct vop_print_args /* { - struct vnode *a_vp; - } */ *ap = v; + struct vop_print_args *ap = v; printf("tag VT_NON, dev %d, %d\n", major(ap->a_vp->v_rdev), minor(ap->a_vp->v_rdev)); @@ -680,11 +624,7 @@ int spec_pathconf(v) void *v; { - struct vop_pathconf_args /* { - struct vnode *a_vp; - int a_name; - register_t *a_retval; - } */ *ap = v; + struct vop_pathconf_args *ap = v; switch (ap->a_name) { case _PC_LINK_MAX: @@ -719,14 +659,7 @@ int spec_advlock(v) void *v; { - struct vop_advlock_args /* { - struct vnodeop_desc *a_desc; - struct vnode *a_vp; - caddr_t a_id; - int a_op; - struct flock *a_fl; - int a_flags; - } */ *ap = v; + struct vop_advlock_args *ap = v; register struct vnode *vp = ap->a_vp; return (lf_advlock(&vp->v_speclockf, (off_t)0, ap->a_id, diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index f2ff3834386..b36090ffcb7 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_default.c,v 1.33 2007/05/26 18:42:21 thib Exp $ */ +/* $OpenBSD: vfs_default.c,v 1.34 2007/06/01 23:47:56 deraadt Exp $ */ /* * Portions of this code are: @@ -57,11 +57,7 @@ void filt_generic_detach(struct knote *); int vop_generic_revoke(void *v) { - struct vop_revoke_args /* { - struct vnodeop_desc *a_desc; - struct vnode *a_vp; - int a_flags; - } */ *ap = v; + struct vop_revoke_args *ap = v; struct vnode *vp, *vq; struct proc *p = curproc; @@ -123,11 +119,7 @@ vop_generic_bwrite(void *v) int vop_generic_abortop(void *v) { - struct vop_abortop_args /* { - struct vnodeop_desc *a_desc; - struct vnode *a_dvp; - struct componentname *a_cnp; - } */ *ap = v; + struct vop_abortop_args *ap = v; if ((ap->a_cnp->cn_flags & (HASBUF | SAVESTART)) == HASBUF) pool_put(&namei_pool, ap->a_cnp->cn_pnbuf); @@ -172,11 +164,7 @@ struct filterops generic_filtops = int vop_generic_kqfilter(void *v) { - struct vop_kqfilter_args /* { - struct vnodeop_desc *a_desc; - struct vnode *a_vp; - struct knote *a_kn; - } */ *ap = v; + struct vop_kqfilter_args *ap = v; struct knote *kn = ap->a_kn; switch (kn->kn_filter) { diff --git a/sys/kern/vfs_sync.c b/sys/kern/vfs_sync.c index f859fab4061..01b8f766784 100644 --- a/sys/kern/vfs_sync.c +++ b/sys/kern/vfs_sync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_sync.c,v 1.42 2006/11/18 10:19:59 jmc Exp $ */ +/* $OpenBSD: vfs_sync.c,v 1.43 2007/06/01 23:47:56 deraadt Exp $ */ /* * Portions of this code are: @@ -327,13 +327,7 @@ vfs_allocate_syncvnode(struct mount *mp) int sync_fsync(void *v) { - struct vop_fsync_args /* { - struct vnodeop_desc *a_desc; - struct vnode *a_vp; - struct ucred *a_cred; - int a_waitfor; - struct proc *a_p; - } */ *ap = v; + struct vop_fsync_args *ap = v; struct vnode *syncvp = ap->a_vp; struct mount *mp = syncvp->v_mount; int asyncflag; @@ -371,11 +365,7 @@ sync_fsync(void *v) int sync_inactive(void *v) { - struct vop_inactive_args /* { - struct vnodeop_desc *a_desc; - struct vnode *a_vp; - struct proc *a_p; - } */ *ap = v; + struct vop_inactive_args *ap = v; struct vnode *vp = ap->a_vp; int s; diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c index 39c943c384a..1472298457c 100644 --- a/sys/miscfs/deadfs/dead_vnops.c +++ b/sys/miscfs/deadfs/dead_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dead_vnops.c,v 1.17 2007/04/08 16:37:10 pedro Exp $ */ +/* $OpenBSD: dead_vnops.c,v 1.18 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: dead_vnops.c,v 1.16 1996/02/13 13:12:48 mycroft Exp $ */ /* @@ -133,11 +133,7 @@ struct vnodeopv_desc dead_vnodeop_opv_desc = int dead_lookup(void *v) { - struct vop_lookup_args /* { - struct vnode * a_dvp; - struct vnode ** a_vpp; - struct componentname * a_cnp; - } */ *ap = v; + struct vop_lookup_args *ap = v; *ap->a_vpp = NULL; return (ENOTDIR); @@ -160,12 +156,7 @@ dead_open(void *v) int dead_read(void *v) { - struct vop_read_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_read_args *ap = v; if (chkvnlock(ap->a_vp)) panic("dead_read: lock"); @@ -184,12 +175,7 @@ dead_read(void *v) int dead_write(void *v) { - struct vop_write_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_write_args *ap = v; if (chkvnlock(ap->a_vp)) panic("dead_write: lock"); @@ -203,14 +189,7 @@ dead_write(void *v) int dead_ioctl(void *v) { - struct vop_ioctl_args /* { - struct vnode *a_vp; - u_long a_command; - caddr_t a_data; - int a_fflag; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_ioctl_args *ap = v; if (!chkvnlock(ap->a_vp)) return (EBADF); @@ -222,11 +201,7 @@ int dead_poll(void *v) { #if 0 - struct vop_poll_args /* { - struct vnode *a_vp; - int a_events; - struct proc *a_p; - } */ *ap = v; + struct vop_poll_args *ap = v; #endif /* @@ -241,9 +216,7 @@ dead_poll(void *v) int dead_strategy(void *v) { - struct vop_strategy_args /* { - struct buf *a_bp; - } */ *ap = v; + struct vop_strategy_args *ap = v; int s; if (ap->a_bp->b_vp == NULL || !chkvnlock(ap->a_bp->b_vp)) { @@ -262,11 +235,7 @@ dead_strategy(void *v) int dead_lock(void *v) { - struct vop_lock_args /* { - struct vnode *a_vp; - int a_flags; - struct proc *a_p; - } */ *ap = v; + struct vop_lock_args *ap = v; struct vnode *vp = ap->a_vp; if (ap->a_flags & LK_DRAIN || !chkvnlock(vp)) @@ -281,13 +250,7 @@ dead_lock(void *v) int dead_bmap(void *v) { - struct vop_bmap_args /* { - struct vnode *a_vp; - daddr_t a_bn; - struct vnode **a_vpp; - daddr_t *a_bnp; - int *a_runp; - } */ *ap = v; + struct vop_bmap_args *ap = v; if (!chkvnlock(ap->a_vp)) return (EIO); diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c index 6ba6fd0c11d..5f7961a2149 100644 --- a/sys/miscfs/fifofs/fifo_vnops.c +++ b/sys/miscfs/fifofs/fifo_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fifo_vnops.c,v 1.22 2007/01/16 17:52:18 thib Exp $ */ +/* $OpenBSD: fifo_vnops.c,v 1.23 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: fifo_vnops.c,v 1.18 1996/03/16 23:52:42 christos Exp $ */ /* @@ -131,11 +131,7 @@ int fifo_lookup(v) void *v; { - struct vop_lookup_args /* { - struct vnode * a_dvp; - struct vnode ** a_vpp; - struct componentname * a_cnp; - } */ *ap = v; + struct vop_lookup_args *ap = v; *ap->a_vpp = NULL; return (ENOTDIR); @@ -150,12 +146,7 @@ int fifo_open(v) void *v; { - struct vop_open_args /* { - struct vnode *a_vp; - int a_mode; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_open_args *ap = v; register struct vnode *vp = ap->a_vp; register struct fifoinfo *fip; struct proc *p = ap->a_p; @@ -241,12 +232,7 @@ int fifo_read(v) void *v; { - struct vop_read_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_read_args *ap = v; register struct uio *uio = ap->a_uio; register struct socket *rso = ap->a_vp->v_fifoinfo->fi_readsock; struct proc *p = uio->uio_procp; @@ -280,12 +266,7 @@ int fifo_write(v) void *v; { - struct vop_write_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_write_args *ap = v; struct socket *wso = ap->a_vp->v_fifoinfo->fi_writesock; struct proc *p = ap->a_uio->uio_procp; int error; @@ -312,14 +293,7 @@ int fifo_ioctl(v) void *v; { - struct vop_ioctl_args /* { - struct vnode *a_vp; - u_long a_command; - caddr_t a_data; - int a_fflag; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_ioctl_args *ap = v; struct file filetmp; int error; @@ -345,11 +319,7 @@ int fifo_poll(v) void *v; { - struct vop_poll_args /* { - struct vnode *a_vp; - int a_events; - struct proc *a_p; - } */ *ap = v; + struct vop_poll_args *ap = v; struct file filetmp; short ostate; int revents = 0; @@ -382,10 +352,7 @@ int fifo_inactive(v) void *v; { - struct vop_inactive_args /* { - struct vnode *a_vp; - struct proc *a_p; - } */ *ap = v; + struct vop_inactive_args *ap = v; VOP_UNLOCK(ap->a_vp, 0, ap->a_p); return (0); @@ -398,13 +365,7 @@ int fifo_bmap(v) void *v; { - struct vop_bmap_args /* { - struct vnode *a_vp; - daddr_t a_bn; - struct vnode **a_vpp; - daddr_t *a_bnp; - int *a_runp; - } */ *ap = v; + struct vop_bmap_args *ap = v; if (ap->a_vpp != NULL) *ap->a_vpp = ap->a_vp; @@ -421,12 +382,7 @@ int fifo_close(v) void *v; { - struct vop_close_args /* { - struct vnode *a_vp; - int a_fflag; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_close_args *ap = v; register struct vnode *vp = ap->a_vp; register struct fifoinfo *fip = vp->v_fifoinfo; int error1 = 0, error2 = 0; @@ -476,9 +432,7 @@ int fifo_print(v) void *v; { - struct vop_print_args /* { - struct vnode *a_vp; - } */ *ap = v; + struct vop_print_args *ap = v; printf("tag VT_NON"); fifo_printinfo(ap->a_vp); @@ -506,11 +460,7 @@ int fifo_pathconf(v) void *v; { - struct vop_pathconf_args /* { - struct vnode *a_vp; - int a_name; - register_t *a_retval; - } */ *ap = v; + struct vop_pathconf_args *ap = v; switch (ap->a_name) { case _PC_LINK_MAX: @@ -570,10 +520,7 @@ int fifo_kqfilter(v) void *v; { - struct vop_kqfilter_args /* { - struct vnode *a_vp; - struct knote *a_kn; - } */ *ap = v; + struct vop_kqfilter_args *ap = v; struct socket *so = (struct socket *)ap->a_vp->v_fifoinfo->fi_readsock; struct sockbuf *sb; diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c index 238a9d90cca..68473dfb8fd 100644 --- a/sys/miscfs/portal/portal_vnops.c +++ b/sys/miscfs/portal/portal_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: portal_vnops.c,v 1.22 2004/07/22 06:12:43 tedu Exp $ */ +/* $OpenBSD: portal_vnops.c,v 1.23 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: portal_vnops.c,v 1.17 1996/02/13 13:12:57 mycroft Exp $ */ /* @@ -175,11 +175,7 @@ int portal_lookup(v) void *v; { - struct vop_lookup_args /* { - struct vnode * a_dvp; - struct vnode ** a_vpp; - struct componentname * a_cnp; - } */ *ap = v; + struct vop_lookup_args *ap = v; struct componentname *cnp = ap->a_cnp; struct vnode **vpp = ap->a_vpp; struct vnode *dvp = ap->a_dvp; @@ -279,12 +275,7 @@ int portal_open(v) void *v; { - struct vop_open_args /* { - struct vnode *a_vp; - int a_mode; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_open_args *ap = v; struct socket *so = 0; struct portalnode *pt; struct proc *p = ap->a_p; @@ -521,12 +512,7 @@ int portal_getattr(v) void *v; { - struct vop_getattr_args /* { - struct vnode *a_vp; - struct vattr *a_vap; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_getattr_args *ap = v; struct vnode *vp = ap->a_vp; struct vattr *vap = ap->a_vap; @@ -568,12 +554,7 @@ int portal_setattr(v) void *v; { - struct vop_setattr_args /* { - struct vnode *a_vp; - struct vattr *a_vap; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_setattr_args *ap = v; /* * Can't mess with the root vnode @@ -604,10 +585,7 @@ int portal_inactive(v) void *v; { - struct vop_inactive_args /* { - struct vnode *a_vp; - struct proc *a_p; - } */ *ap = v; + struct vop_inactive_args *ap = v; VOP_UNLOCK(ap->a_vp, 0, ap->a_p); return (0); @@ -617,9 +595,7 @@ int portal_reclaim(v) void *v; { - struct vop_reclaim_args /* { - struct vnode *a_vp; - } */ *ap = v; + struct vop_reclaim_args *ap = v; struct portalnode *pt = VTOPORTAL(ap->a_vp); if (pt->pt_arg) { @@ -639,11 +615,7 @@ int portal_pathconf(v) void *v; { - struct vop_pathconf_args /* { - struct vnode *a_vp; - int a_name; - register_t *a_retval; - } */ *ap = v; + struct vop_pathconf_args *ap = v; switch (ap->a_name) { case _PC_LINK_MAX: @@ -686,11 +658,7 @@ int portal_link(v) void *v; { - struct vop_link_args /* { - struct vnode *a_dvp; - struct vnode *a_vp; - struct componentname *a_cnp; - } */ *ap = v; + struct vop_link_args *ap = v; VOP_ABORTOP(ap->a_dvp, ap->a_cnp); vput(ap->a_dvp); @@ -701,13 +669,7 @@ int portal_symlink(v) void *v; { - struct vop_symlink_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - struct vattr *a_vap; - char *a_target; - } */ *ap = v; + struct vop_symlink_args *ap = v; VOP_ABORTOP(ap->a_dvp, ap->a_cnp); vput(ap->a_dvp); @@ -726,11 +688,7 @@ int portal_poll(v) void *v; { - struct vop_poll_args /* { - struct vnode *a_vp; - int a_events; - struct proc *a_p; - } */ *ap = v; + struct vop_poll_args *ap = v; return (ap->a_events & (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)); } diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c index 90f7f578b23..12813cf8b34 100644 --- a/sys/miscfs/procfs/procfs_vnops.c +++ b/sys/miscfs/procfs/procfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: procfs_vnops.c,v 1.38 2006/03/05 21:48:56 miod Exp $ */ +/* $OpenBSD: procfs_vnops.c,v 1.39 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: procfs_vnops.c,v 1.40 1996/03/16 23:52:55 christos Exp $ */ /* @@ -207,12 +207,7 @@ int procfs_open(v) void *v; { - struct vop_open_args /* { - struct vnode *a_vp; - int a_mode; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_open_args *ap = v; struct pfsnode *pfs = VTOPFS(ap->a_vp); struct proc *p1 = ap->a_p; /* tracer */ struct proc *p2; /* traced */ @@ -253,12 +248,7 @@ int procfs_close(v) void *v; { - struct vop_close_args /* { - struct vnode *a_vp; - int a_fflag; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_close_args *ap = v; struct pfsnode *pfs = VTOPFS(ap->a_vp); switch (pfs->pfs_type) { @@ -313,12 +303,7 @@ int procfs_bmap(v) void *v; { - struct vop_bmap_args /* { - struct vnode *a_vp; - daddr_t a_bn; - struct vnode **a_vpp; - daddr_t *a_bnp; - } */ *ap = v; + struct vop_bmap_args *ap = v; if (ap->a_vpp != NULL) *ap->a_vpp = ap->a_vp; @@ -347,9 +332,7 @@ int procfs_inactive(v) void *v; { - struct vop_inactive_args /* { - struct vnode *a_vp; - } */ *ap = v; + struct vop_inactive_args *ap = v; struct vnode *vp = ap->a_vp; struct pfsnode *pfs = VTOPFS(vp); @@ -370,9 +353,7 @@ int procfs_reclaim(v) void *v; { - struct vop_reclaim_args /* { - struct vnode *a_vp; - } */ *ap = v; + struct vop_reclaim_args *ap = v; return (procfs_freevp(ap->a_vp)); } @@ -384,11 +365,7 @@ int procfs_pathconf(v) void *v; { - struct vop_pathconf_args /* { - struct vnode *a_vp; - int a_name; - register_t *a_retval; - } */ *ap = v; + struct vop_pathconf_args *ap = v; switch (ap->a_name) { case _PC_LINK_MAX: @@ -424,9 +401,7 @@ int procfs_print(v) void *v; { - struct vop_print_args /* { - struct vnode *a_vp; - } */ *ap = v; + struct vop_print_args *ap = v; struct pfsnode *pfs = VTOPFS(ap->a_vp); printf("tag VT_PROCFS, type %d, pid %d, mode %x, flags %lx\n", @@ -438,11 +413,7 @@ int procfs_link(v) void *v; { - struct vop_link_args /* { - struct vnode *a_dvp; - struct vnode *a_vp; - struct componentname *a_cnp; - } */ *ap = v; + struct vop_link_args *ap = v; VOP_ABORTOP(ap->a_dvp, ap->a_cnp); vput(ap->a_dvp); @@ -453,13 +424,7 @@ int procfs_symlink(v) void *v; { - struct vop_symlink_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - struct vattr *a_vap; - char *a_target; - } */ *ap = v; + struct vop_symlink_args *ap = v; VOP_ABORTOP(ap->a_dvp, ap->a_cnp); vput(ap->a_dvp); @@ -492,12 +457,7 @@ int procfs_getattr(v) void *v; { - struct vop_getattr_args /* { - struct vnode *a_vp; - struct vattr *a_vap; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_getattr_args *ap = v; struct pfsnode *pfs = VTOPFS(ap->a_vp); struct vattr *vap = ap->a_vap; struct proc *procp; @@ -704,12 +664,7 @@ int procfs_access(v) void *v; { - struct vop_access_args /* { - struct vnode *a_vp; - int a_mode; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_access_args *ap = v; struct vattr va; int error; @@ -733,11 +688,7 @@ int procfs_lookup(v) void *v; { - struct vop_lookup_args /* { - struct vnode * a_dvp; - struct vnode ** a_vpp; - struct componentname * a_cnp; - } */ *ap = v; + struct vop_lookup_args *ap = v; struct componentname *cnp = ap->a_cnp; struct vnode **vpp = ap->a_vpp; struct vnode *dvp = ap->a_dvp; @@ -912,14 +863,7 @@ int procfs_readdir(v) void *v; { - struct vop_readdir_args /* { - struct vnode *a_vp; - struct uio *a_uio; - struct ucred *a_cred; - int *a_eofflag; - u_long *a_cookies; - int a_ncookies; - } */ *ap = v; + struct vop_readdir_args *ap = v; struct uio *uio = ap->a_uio; struct dirent d; struct pfsnode *pfs; @@ -1129,11 +1073,7 @@ int procfs_poll(v) void *v; { - struct vop_poll_args /* { - struct vnode *a_vp; - int a_events; - struct proc *a_p; - } */ *ap = v; + struct vop_poll_args *ap = v; return (ap->a_events & (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)); } diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c index f06ee19defe..139cef8871a 100644 --- a/sys/miscfs/specfs/spec_vnops.c +++ b/sys/miscfs/specfs/spec_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spec_vnops.c,v 1.40 2007/05/29 06:28:15 otto Exp $ */ +/* $OpenBSD: spec_vnops.c,v 1.41 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $ */ /* @@ -113,11 +113,7 @@ int spec_lookup(v) void *v; { - struct vop_lookup_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - } */ *ap = v; + struct vop_lookup_args *ap = v; *ap->a_vpp = NULL; return (ENOTDIR); @@ -131,12 +127,7 @@ int spec_open(v) void *v; { - struct vop_open_args /* { - struct vnode *a_vp; - int a_mode; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_open_args *ap = v; struct proc *p = ap->a_p; struct vnode *vp = ap->a_vp; struct vnode *bvp; @@ -225,12 +216,7 @@ int spec_read(v) void *v; { - struct vop_read_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_read_args *ap = v; register struct vnode *vp = ap->a_vp; register struct uio *uio = ap->a_uio; struct proc *p = uio->uio_procp; @@ -307,10 +293,7 @@ int spec_inactive(v) void *v; { - struct vop_inactive_args /* { - struct vnode *a_vp; - struct proc *a_p; - } */ *ap = v; + struct vop_inactive_args *ap = v; VOP_UNLOCK(ap->a_vp, 0, ap->a_p); return (0); @@ -324,12 +307,7 @@ int spec_write(v) void *v; { - struct vop_write_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_write_args *ap = v; register struct vnode *vp = ap->a_vp; register struct uio *uio = ap->a_uio; struct proc *p = uio->uio_procp; @@ -407,14 +385,7 @@ int spec_ioctl(v) void *v; { - struct vop_ioctl_args /* { - struct vnode *a_vp; - u_long a_command; - caddr_t a_data; - int a_fflag; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_ioctl_args *ap = v; dev_t dev = ap->a_vp->v_rdev; int maj = major(dev); @@ -439,11 +410,7 @@ int spec_poll(v) void *v; { - struct vop_poll_args /* { - struct vnode *a_vp; - int a_events; - struct proc *a_p; - } */ *ap = v; + struct vop_poll_args *ap = v; register dev_t dev; switch (ap->a_vp->v_type) { @@ -462,10 +429,7 @@ int spec_kqfilter(v) void *v; { - struct vop_kqfilter_args /* { - struct vnode *a_vp; - struct knote *a_kn; - } */ *ap = v; + struct vop_kqfilter_args *ap = v; dev_t dev; @@ -483,12 +447,7 @@ int spec_fsync(v) void *v; { - struct vop_fsync_args /* { - struct vnode *a_vp; - struct ucred *a_cred; - int a_waitfor; - struct proc *a_p; - } */ *ap = v; + struct vop_fsync_args *ap = v; register struct vnode *vp = ap->a_vp; register struct buf *bp; struct buf *nbp; @@ -533,9 +492,7 @@ int spec_strategy(v) void *v; { - struct vop_strategy_args /* { - struct buf *a_bp; - } */ *ap = v; + struct vop_strategy_args *ap = v; struct buf *bp = ap->a_bp; int maj = major(bp->b_dev); @@ -553,13 +510,7 @@ int spec_bmap(v) void *v; { - struct vop_bmap_args /* { - struct vnode *a_vp; - daddr_t a_bn; - struct vnode **a_vpp; - daddr_t *a_bnp; - int *a_runp; - } */ *ap = v; + struct vop_bmap_args *ap = v; if (ap->a_vpp != NULL) *ap->a_vpp = ap->a_vp; @@ -579,12 +530,7 @@ int spec_close(v) void *v; { - struct vop_close_args /* { - struct vnode *a_vp; - int a_fflag; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_close_args *ap = v; register struct vnode *vp = ap->a_vp; dev_t dev = vp->v_rdev; int (*devclose)(dev_t, int, int, struct proc *); @@ -664,9 +610,7 @@ int spec_print(v) void *v; { - struct vop_print_args /* { - struct vnode *a_vp; - } */ *ap = v; + struct vop_print_args *ap = v; printf("tag VT_NON, dev %d, %d\n", major(ap->a_vp->v_rdev), minor(ap->a_vp->v_rdev)); @@ -680,11 +624,7 @@ int spec_pathconf(v) void *v; { - struct vop_pathconf_args /* { - struct vnode *a_vp; - int a_name; - register_t *a_retval; - } */ *ap = v; + struct vop_pathconf_args *ap = v; switch (ap->a_name) { case _PC_LINK_MAX: @@ -719,14 +659,7 @@ int spec_advlock(v) void *v; { - struct vop_advlock_args /* { - struct vnodeop_desc *a_desc; - struct vnode *a_vp; - caddr_t a_id; - int a_op; - struct flock *a_fl; - int a_flags; - } */ *ap = v; + struct vop_advlock_args *ap = v; register struct vnode *vp = ap->a_vp; return (lf_advlock(&vp->v_speclockf, (off_t)0, ap->a_id, diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c index 1f9b8f44400..647a447e3f9 100644 --- a/sys/msdosfs/msdosfs_denode.c +++ b/sys/msdosfs/msdosfs_denode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfs_denode.c,v 1.30 2007/04/11 16:08:50 thib Exp $ */ +/* $OpenBSD: msdosfs_denode.c,v 1.31 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: msdosfs_denode.c,v 1.23 1997/10/17 11:23:58 ws Exp $ */ /*- @@ -587,9 +587,7 @@ int msdosfs_reclaim(v) void *v; { - struct vop_reclaim_args /* { - struct vnode *a_vp; - } */ *ap = v; + struct vop_reclaim_args *ap = v; struct vnode *vp = ap->a_vp; struct denode *dep = VTODE(vp); #ifdef DIAGNOSTIC @@ -628,10 +626,7 @@ int msdosfs_inactive(v) void *v; { - struct vop_inactive_args /* { - struct vnode *a_vp; - struct proc *a_p; - } */ *ap = v; + struct vop_inactive_args *ap = v; struct vnode *vp = ap->a_vp; struct denode *dep = VTODE(vp); struct proc *p = ap->a_p; diff --git a/sys/msdosfs/msdosfs_lookup.c b/sys/msdosfs/msdosfs_lookup.c index bc9b84f9e01..9543058b362 100644 --- a/sys/msdosfs/msdosfs_lookup.c +++ b/sys/msdosfs/msdosfs_lookup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfs_lookup.c,v 1.17 2007/04/10 15:21:04 pedro Exp $ */ +/* $OpenBSD: msdosfs_lookup.c,v 1.18 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: msdosfs_lookup.c,v 1.34 1997/10/18 22:12:27 ws Exp $ */ /*- @@ -81,11 +81,7 @@ int msdosfs_lookup(v) void *v; { - struct vop_lookup_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - } */ *ap = v; + struct vop_lookup_args *ap = v; struct vnode *vdp = ap->a_dvp; struct vnode **vpp = ap->a_vpp; struct componentname *cnp = ap->a_cnp; diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c index 892022534fa..aedd986adf0 100644 --- a/sys/msdosfs/msdosfs_vnops.c +++ b/sys/msdosfs/msdosfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfs_vnops.c,v 1.62 2007/04/02 21:18:59 pedro Exp $ */ +/* $OpenBSD: msdosfs_vnops.c,v 1.63 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.63 1997/10/17 11:24:19 ws Exp $ */ /*- @@ -106,12 +106,7 @@ int msdosfs_create(v) void *v; { - struct vop_create_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - struct vattr *a_vap; - } */ *ap = v; + struct vop_create_args *ap = v; struct componentname *cnp = ap->a_cnp; struct denode ndirent; struct denode *dep; @@ -176,12 +171,7 @@ int msdosfs_mknod(v) void *v; { - struct vop_mknod_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - struct vattr *a_vap; - } */ *ap = v; + struct vop_mknod_args *ap = v; pool_put(&namei_pool, ap->a_cnp->cn_pnbuf); vput(ap->a_dvp); @@ -208,12 +198,7 @@ int msdosfs_close(v) void *v; { - struct vop_close_args /* { - struct vnode *a_vp; - int a_fflag; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_close_args *ap = v; struct vnode *vp = ap->a_vp; struct denode *dep = VTODE(vp); struct timespec ts; @@ -229,12 +214,7 @@ int msdosfs_access(v) void *v; { - struct vop_access_args /* { - struct vnode *a_vp; - int a_mode; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_access_args *ap = v; struct denode *dep = VTODE(ap->a_vp); struct msdosfsmount *pmp = dep->de_pmp; mode_t dosmode; @@ -258,12 +238,7 @@ int msdosfs_getattr(v) void *v; { - struct vop_getattr_args /* { - struct vnode *a_vp; - struct vattr *a_vap; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_getattr_args *ap = v; struct denode *dep = VTODE(ap->a_vp); struct msdosfsmount *pmp = dep->de_pmp; struct vattr *vap = ap->a_vap; @@ -365,12 +340,7 @@ int msdosfs_setattr(v) void *v; { - struct vop_setattr_args /* { - struct vnode *a_vp; - struct vattr *a_vap; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_setattr_args *ap = v; int error = 0; struct denode *dep = VTODE(ap->a_vp); struct vattr *vap = ap->a_vap; @@ -457,12 +427,7 @@ int msdosfs_read(v) void *v; { - struct vop_read_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_read_args *ap = v; int error = 0; uint32_t diff; int blsize; @@ -548,12 +513,7 @@ int msdosfs_write(v) void *v; { - struct vop_write_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_write_args *ap = v; int n; int croffset; int resid; @@ -762,11 +722,7 @@ int msdosfs_poll(v) void *v; { - struct vop_poll_args /* { - struct vnode *a_vp; - int a_events; - struct proc *a_p; - } */ *ap = v; + struct vop_poll_args *ap = v; return (ap->a_events & (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)); } @@ -781,12 +737,7 @@ int msdosfs_fsync(v) void *v; { - struct vop_fsync_args /* { - struct vnode *a_vp; - struct ucred *a_cred; - int a_waitfor; - struct proc *a_p; - } */ *ap = v; + struct vop_fsync_args *ap = v; struct vnode *vp = ap->a_vp; vflushbuf(vp, ap->a_waitfor == MNT_WAIT); @@ -803,11 +754,7 @@ int msdosfs_remove(v) void *v; { - struct vop_remove_args /* { - struct vnode *a_dvp; - struct vnode *a_vp; - struct componentname *a_cnp; - } */ *ap = v; + struct vop_remove_args *ap = v; struct denode *dep = VTODE(ap->a_vp); struct denode *ddep = VTODE(ap->a_dvp); int error; @@ -837,11 +784,7 @@ int msdosfs_link(v) void *v; { - struct vop_link_args /* { - struct vnode *a_dvp; - struct vnode *a_vp; - struct componentname *a_cnp; - } */ *ap = v; + struct vop_link_args *ap = v; VOP_ABORTOP(ap->a_dvp, ap->a_cnp); vput(ap->a_dvp); @@ -905,14 +848,7 @@ int msdosfs_rename(v) void *v; { - struct vop_rename_args /* { - struct vnode *a_fdvp; - struct vnode *a_fvp; - struct componentname *a_fcnp; - struct vnode *a_tdvp; - struct vnode *a_tvp; - struct componentname *a_tcnp; - } */ *ap = v; + struct vop_rename_args *ap = v; struct vnode *tvp = ap->a_tvp; register struct vnode *tdvp = ap->a_tdvp; struct vnode *fvp = ap->a_fvp; @@ -1249,12 +1185,7 @@ int msdosfs_mkdir(v) void *v; { - struct vop_mkdir_args /* { - struct vnode *a_dvp; - struvt vnode **a_vpp; - struvt componentname *a_cnp; - struct vattr *a_vap; - } */ *ap = v; + struct vop_mkdir_args *ap = v; struct componentname *cnp = ap->a_cnp; struct denode ndirent; struct denode *dep; @@ -1364,11 +1295,7 @@ int msdosfs_rmdir(v) void *v; { - struct vop_rmdir_args /* { - struct vnode *a_dvp; - struct vnode *a_vp; - struct componentname *a_cnp; - } */ *ap = v; + struct vop_rmdir_args *ap = v; register struct vnode *vp = ap->a_vp; register struct vnode *dvp = ap->a_dvp; register struct componentname *cnp = ap->a_cnp; @@ -1434,13 +1361,7 @@ int msdosfs_symlink(v) void *v; { - struct vop_symlink_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - struct vattr *a_vap; - char *a_target; - } */ *ap = v; + struct vop_symlink_args *ap = v; VOP_ABORTOP(ap->a_dvp, ap->a_cnp); vput(ap->a_dvp); @@ -1451,14 +1372,7 @@ int msdosfs_readdir(v) void *v; { - struct vop_readdir_args /* { - struct vnode *a_vp; - struct uio *a_uio; - struct ucred *a_cred; - int *a_eofflag; - u_long **a_cookies; - int *a_ncookies; - } */ *ap = v; + struct vop_readdir_args *ap = v; int error = 0; int diff; long n; @@ -1748,11 +1662,7 @@ int msdosfs_lock(v) void *v; { - struct vop_lock_args /* { - struct vnode *a_vp; - int a_flags; - struct proc *a_p; - } */ *ap = v; + struct vop_lock_args *ap = v; struct vnode *vp = ap->a_vp; return (lockmgr(&VTODE(vp)->de_lock, ap->a_flags, NULL)); @@ -1762,9 +1672,7 @@ int msdosfs_unlock(v) void *v; { - struct vop_unlock_args /* { - struct vnode *vp; - } */ *ap = v; + struct vop_unlock_args *ap = v; struct vnode *vp = ap->a_vp; return (lockmgr(&VTODE(vp)->de_lock, ap->a_flags | LK_RELEASE, NULL)); @@ -1774,9 +1682,7 @@ int msdosfs_islocked(v) void *v; { - struct vop_islocked_args /* { - struct vnode *a_vp; - } */ *ap = v; + struct vop_islocked_args *ap = v; return (lockstatus(&VTODE(ap->a_vp)->de_lock)); } @@ -1792,13 +1698,7 @@ int msdosfs_bmap(v) void *v; { - struct vop_bmap_args /* { - struct vnode *a_vp; - daddr_t a_bn; - struct vnode **a_vpp; - daddr_t *a_bnp; - int *a_runp; - } */ *ap = v; + struct vop_bmap_args *ap = v; struct denode *dep = VTODE(ap->a_vp); struct msdosfsmount *pmp = dep->de_pmp; @@ -1819,9 +1719,7 @@ int msdosfs_strategy(v) void *v; { - struct vop_strategy_args /* { - struct buf *a_bp; - } */ *ap = v; + struct vop_strategy_args *ap = v; struct buf *bp = ap->a_bp; struct denode *dep = VTODE(bp->b_vp); struct vnode *vp; @@ -1866,9 +1764,7 @@ int msdosfs_print(v) void *v; { - struct vop_print_args /* { - struct vnode *vp; - } */ *ap = v; + struct vop_print_args *ap = v; struct denode *dep = VTODE(ap->a_vp); printf( @@ -1888,13 +1784,7 @@ int msdosfs_advlock(v) void *v; { - struct vop_advlock_args /* { - struct vnode *a_vp; - caddr_t a_id; - int a_op; - struct flock *a_fl; - int a_flags; - } */ *ap = v; + struct vop_advlock_args *ap = v; register struct denode *dep = VTODE(ap->a_vp); return (lf_advlock(&dep->de_lockf, dep->de_FileSize, ap->a_id, ap->a_op, @@ -1905,11 +1795,7 @@ int msdosfs_pathconf(v) void *v; { - struct vop_pathconf_args /* { - struct vnode *a_vp; - int a_name; - register_t *a_retval; - } */ *ap = v; + struct vop_pathconf_args *ap = v; struct msdosfsmount *pmp = VTODE(ap->a_vp)->de_pmp; switch (ap->a_name) { diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c index 91c84d585eb..a5246920371 100644 --- a/sys/nfs/nfs_bio.c +++ b/sys/nfs/nfs_bio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_bio.c,v 1.45 2007/06/01 07:13:47 thib Exp $ */ +/* $OpenBSD: nfs_bio.c,v 1.46 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: nfs_bio.c,v 1.25.4.2 1996/07/08 20:47:04 jtc Exp $ */ /* @@ -274,12 +274,7 @@ int nfs_write(v) void *v; { - struct vop_write_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_write_args *ap = v; int biosize; struct uio *uio = ap->a_uio; struct proc *p = uio->uio_procp; diff --git a/sys/nfs/nfs_kq.c b/sys/nfs/nfs_kq.c index c74d9c72a6a..df806d9314b 100644 --- a/sys/nfs/nfs_kq.c +++ b/sys/nfs/nfs_kq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_kq.c,v 1.8 2007/05/31 20:29:23 thib Exp $ */ +/* $OpenBSD: nfs_kq.c,v 1.9 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: nfs_kq.c,v 1.7 2003/10/30 01:43:10 simonb Exp $ */ /*- @@ -259,10 +259,7 @@ static const struct filterops nfsvnode_filtops = int nfs_kqfilter(void *v) { - struct vop_kqfilter_args /* { - struct vnode *a_vp; - struct knote *a_kn; - } */ *ap = v; + struct vop_kqfilter_args *ap = v; struct vnode *vp; struct knote *kn; struct kevq *ke; diff --git a/sys/nfs/nfs_node.c b/sys/nfs/nfs_node.c index 6c22ad13751..40ba88ea161 100644 --- a/sys/nfs/nfs_node.c +++ b/sys/nfs/nfs_node.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_node.c,v 1.34 2007/05/29 00:17:33 thib Exp $ */ +/* $OpenBSD: nfs_node.c,v 1.35 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: nfs_node.c,v 1.16 1996/02/18 11:53:42 fvdl Exp $ */ /* @@ -159,10 +159,7 @@ int nfs_inactive(v) void *v; { - struct vop_inactive_args /* { - struct vnode *a_vp; - struct proc *a_p; - } */ *ap = v; + struct vop_inactive_args *ap = v; struct nfsnode *np; struct sillyrename *sp; struct proc *p = curproc; /* XXX */ @@ -202,9 +199,7 @@ int nfs_reclaim(v) void *v; { - struct vop_reclaim_args /* { - struct vnode *a_vp; - } */ *ap = v; + struct vop_reclaim_args *ap = v; struct vnode *vp = ap->a_vp; struct nfsnode *np = VTONFS(vp); struct nfsdmap *dp, *dp2; diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index d5654e82b90..97f00d86548 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_vnops.c,v 1.74 2007/06/01 07:13:47 thib Exp $ */ +/* $OpenBSD: nfs_vnops.c,v 1.75 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $ */ /* @@ -215,12 +215,7 @@ int nfs_access(v) void *v; { - struct vop_access_args /* { - struct vnode *a_vp; - int a_mode; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_access_args *ap = v; struct vnode *vp = ap->a_vp; u_int32_t *tl; caddr_t cp; @@ -307,12 +302,7 @@ int nfs_open(v) void *v; { - struct vop_open_args /* { - struct vnode *a_vp; - int a_mode; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_open_args *ap = v; struct vnode *vp = ap->a_vp; struct nfsnode *np = VTONFS(vp); struct vattr vattr; @@ -407,13 +397,7 @@ int nfs_close(v) void *v; { - struct vop_close_args /* { - struct vnodeop_desc *a_desc; - struct vnode *a_vp; - int a_fflag; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_close_args *ap = v; struct vnode *vp = ap->a_vp; struct nfsnode *np = VTONFS(vp); int error = 0; @@ -442,12 +426,7 @@ int nfs_getattr(v) void *v; { - struct vop_getattr_args /* { - struct vnode *a_vp; - struct vattr *a_vap; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_getattr_args *ap = v; struct vnode *vp = ap->a_vp; struct nfsnode *np = VTONFS(vp); caddr_t cp; @@ -485,13 +464,7 @@ int nfs_setattr(v) void *v; { - struct vop_setattr_args /* { - struct vnodeop_desc *a_desc; - struct vnode *a_vp; - struct vattr *a_vap; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_setattr_args *ap = v; struct vnode *vp = ap->a_vp; struct nfsnode *np = VTONFS(vp); struct vattr *vap = ap->a_vap; @@ -626,12 +599,7 @@ int nfs_lookup(v) void *v; { - struct vop_lookup_args /* { - struct vnodeop_desc *a_desc; - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - } */ *ap = v; + struct vop_lookup_args *ap = v; struct componentname *cnp = ap->a_cnp; struct vnode *dvp = ap->a_dvp; struct vnode **vpp = ap->a_vpp; @@ -888,12 +856,7 @@ int nfs_read(v) void *v; { - struct vop_read_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_read_args *ap = v; struct vnode *vp = ap->a_vp; if (vp->v_type != VREG) @@ -908,11 +871,7 @@ int nfs_readlink(v) void *v; { - struct vop_readlink_args /* { - struct vnode *a_vp; - struct uio *a_uio; - struct ucred *a_cred; - } */ *ap = v; + struct vop_readlink_args *ap = v; struct vnode *vp = ap->a_vp; if (vp->v_type != VLNK) @@ -1225,12 +1184,7 @@ int nfs_mknod(v) void *v; { - struct vop_mknod_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - struct vattr *a_vap; - } */ *ap = v; + struct vop_mknod_args *ap = v; struct vnode *newvp; int error; @@ -1251,12 +1205,7 @@ int nfs_create(v) void *v; { - struct vop_create_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - struct vattr *a_vap; - } */ *ap = v; + struct vop_create_args *ap = v; struct vnode *dvp = ap->a_dvp; struct vattr *vap = ap->a_vap; struct componentname *cnp = ap->a_cnp; @@ -1365,12 +1314,7 @@ int nfs_remove(v) void *v; { - struct vop_remove_args /* { - struct vnodeop_desc *a_desc; - struct vnode * a_dvp; - struct vnode * a_vp; - struct componentname * a_cnp; - } */ *ap = v; + struct vop_remove_args *ap = v; struct vnode *vp = ap->a_vp; struct vnode *dvp = ap->a_dvp; struct componentname *cnp = ap->a_cnp; @@ -1480,14 +1424,7 @@ int nfs_rename(v) void *v; { - struct vop_rename_args /* { - struct vnode *a_fdvp; - struct vnode *a_fvp; - struct componentname *a_fcnp; - struct vnode *a_tdvp; - struct vnode *a_tvp; - struct componentname *a_tcnp; - } */ *ap = v; + struct vop_rename_args *ap = v; struct vnode *fvp = ap->a_fvp; struct vnode *tvp = ap->a_tvp; struct vnode *fdvp = ap->a_fdvp; @@ -1613,11 +1550,7 @@ int nfs_link(v) void *v; { - struct vop_link_args /* { - struct vnode *a_dvp; - struct vnode *a_vp; - struct componentname *a_cnp; - } */ *ap = v; + struct vop_link_args *ap = v; struct vnode *vp = ap->a_vp; struct vnode *dvp = ap->a_dvp; struct componentname *cnp = ap->a_cnp; @@ -1683,13 +1616,7 @@ int nfs_symlink(v) void *v; { - struct vop_symlink_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - struct vattr *a_vap; - char *a_target; - } */ *ap = v; + struct vop_symlink_args *ap = v; struct vnode *dvp = ap->a_dvp; struct vattr *vap = ap->a_vap; struct componentname *cnp = ap->a_cnp; @@ -1751,12 +1678,7 @@ int nfs_mkdir(v) void *v; { - struct vop_mkdir_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - struct vattr *a_vap; - } */ *ap = v; + struct vop_mkdir_args *ap = v; struct vnode *dvp = ap->a_dvp; struct vattr *vap = ap->a_vap; struct componentname *cnp = ap->a_cnp; @@ -1835,11 +1757,7 @@ int nfs_rmdir(v) void *v; { - struct vop_rmdir_args /* { - struct vnode *a_dvp; - struct vnode *a_vp; - struct componentname *a_cnp; - } */ *ap = v; + struct vop_rmdir_args *ap = v; struct vnode *vp = ap->a_vp; struct vnode *dvp = ap->a_dvp; struct componentname *cnp = ap->a_cnp; @@ -1914,14 +1832,7 @@ int nfs_readdir(v) void *v; { - struct vop_readdir_args /* { - struct vnode *a_vp; - struct uio *a_uio; - struct ucred *a_cred; - int *a_eofflag; - u_long **a_cookies; - int *a_ncookies; - } */ *ap = v; + struct vop_readdir_args *ap = v; struct vnode *vp = ap->a_vp; struct nfsnode *np = VTONFS(vp); struct uio *uio = ap->a_uio; @@ -2666,13 +2577,7 @@ int nfs_bmap(v) void *v; { - struct vop_bmap_args /* { - struct vnode *a_vp; - daddr64_t a_bn; - struct vnode **a_vpp; - daddr64_t *a_bnp; - int *a_runp; - } */ *ap = v; + struct vop_bmap_args *ap = v; struct vnode *vp = ap->a_vp; if (ap->a_vpp != NULL) @@ -2721,13 +2626,7 @@ int nfs_fsync(v) void *v; { - struct vop_fsync_args /* { - struct vnodeop_desc *a_desc; - struct vnode * a_vp; - struct ucred * a_cred; - int a_waitfor; - struct proc * a_p; - } */ *ap = v; + struct vop_fsync_args *ap = v; return (nfs_flush(ap->a_vp, ap->a_cred, ap->a_waitfor, ap->a_p, 1)); } @@ -2913,11 +2812,7 @@ nfs_pathconf(v) void *v; { #if 0 - struct vop_pathconf_args /* { - struct vnode *a_vp; - int a_name; - register_t *a_retval; - } */ *ap = v; + struct vop_pathconf_args *ap = v; #endif return (EINVAL); @@ -2930,13 +2825,7 @@ int nfs_advlock(v) void *v; { - struct vop_advlock_args /* { - struct vnode *a_vp; - caddr_t a_id; - int a_op; - struct flock *a_fl; - int a_flags; - } */ *ap = v; + struct vop_advlock_args *ap = v; struct nfsnode *np = VTONFS(ap->a_vp); return (lf_advlock(&np->n_lockf, np->n_size, ap->a_id, ap->a_op, @@ -2950,9 +2839,7 @@ int nfs_print(v) void *v; { - struct vop_print_args /* { - struct vnode *a_vp; - } */ *ap = v; + struct vop_print_args *ap = v; struct vnode *vp = ap->a_vp; struct nfsnode *np = VTONFS(vp); @@ -2973,9 +2860,7 @@ int nfs_bwrite(v) void *v; { - struct vop_bwrite_args /* { - struct buf *a_bp; - } */ *ap = v; + struct vop_bwrite_args *ap = v; return (nfs_writebp(ap->a_bp, 1)); } @@ -3096,12 +2981,7 @@ int nfsspec_access(v) void *v; { - struct vop_access_args /* { - struct vnode *a_vp; - int a_mode; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_access_args *ap = v; struct vattr va; struct vnode *vp = ap->a_vp; int error; @@ -3135,11 +3015,7 @@ int nfs_poll(v) void *v; { - struct vop_poll_args /* { - struct vnode *a_vp; - int a_events; - struct proc *a_p; - } */ *ap = v; + struct vop_poll_args *ap = v; /* * We should really check to see if I/O is possible. @@ -3154,12 +3030,7 @@ int nfsspec_read(v) void *v; { - struct vop_read_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_read_args *ap = v; struct nfsnode *np = VTONFS(ap->a_vp); /* @@ -3177,12 +3048,7 @@ int nfsspec_write(v) void *v; { - struct vop_write_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_write_args *ap = v; struct nfsnode *np = VTONFS(ap->a_vp); /* @@ -3202,12 +3068,7 @@ int nfsspec_close(v) void *v; { - struct vop_close_args /* { - struct vnode *a_vp; - int a_fflag; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_close_args *ap = v; struct vnode *vp = ap->a_vp; struct nfsnode *np = VTONFS(vp); struct vattr vattr; @@ -3235,12 +3096,7 @@ int nfsfifo_read(v) void *v; { - struct vop_read_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_read_args *ap = v; extern int (**fifo_vnodeop_p)(void *); struct nfsnode *np = VTONFS(ap->a_vp); @@ -3259,12 +3115,7 @@ int nfsfifo_write(v) void *v; { - struct vop_write_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_write_args *ap = v; extern int (**fifo_vnodeop_p)(void *); struct nfsnode *np = VTONFS(ap->a_vp); @@ -3285,12 +3136,7 @@ int nfsfifo_close(v) void *v; { - struct vop_close_args /* { - struct vnode *a_vp; - int a_fflag; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_close_args *ap = v; struct vnode *vp = ap->a_vp; struct nfsnode *np = VTONFS(vp); struct vattr vattr; diff --git a/sys/ufs/ext2fs/ext2fs_bmap.c b/sys/ufs/ext2fs/ext2fs_bmap.c index 40fc4542cd6..543aa609003 100644 --- a/sys/ufs/ext2fs/ext2fs_bmap.c +++ b/sys/ufs/ext2fs/ext2fs_bmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_bmap.c,v 1.12 2006/10/03 19:49:06 pedro Exp $ */ +/* $OpenBSD: ext2fs_bmap.c,v 1.13 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: ext2fs_bmap.c,v 1.5 2000/03/30 12:41:11 augustss Exp $ */ /* @@ -68,13 +68,7 @@ int ext2fs_bmap(v) void *v; { - struct vop_bmap_args /* { - struct vnode *a_vp; - daddr_t a_bn; - struct vnode **a_vpp; - daddr_t *a_bnp; - int *a_runp; - } */ *ap = v; + struct vop_bmap_args *ap = v; /* * Check for underlying vnode requests and ensure that logical * to physical mapping is requested. diff --git a/sys/ufs/ext2fs/ext2fs_inode.c b/sys/ufs/ext2fs/ext2fs_inode.c index a7bb5073f3f..bd0b79408a0 100644 --- a/sys/ufs/ext2fs/ext2fs_inode.c +++ b/sys/ufs/ext2fs/ext2fs_inode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_inode.c,v 1.35 2007/05/26 20:26:51 pedro Exp $ */ +/* $OpenBSD: ext2fs_inode.c,v 1.36 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: ext2fs_inode.c,v 1.24 2001/06/19 12:59:18 wiz Exp $ */ /* @@ -108,10 +108,7 @@ int ext2fs_inactive(v) void *v; { - struct vop_inactive_args /* { - struct vnode *a_vp; - struct proc *a_p; - } */ *ap = v; + struct vop_inactive_args *ap = v; struct vnode *vp = ap->a_vp; struct inode *ip = VTOI(vp); struct proc *p = ap->a_p; diff --git a/sys/ufs/ext2fs/ext2fs_lookup.c b/sys/ufs/ext2fs/ext2fs_lookup.c index d42f07fba4d..fda87a41c9e 100644 --- a/sys/ufs/ext2fs/ext2fs_lookup.c +++ b/sys/ufs/ext2fs/ext2fs_lookup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_lookup.c,v 1.21 2005/12/28 20:48:17 pedro Exp $ */ +/* $OpenBSD: ext2fs_lookup.c,v 1.22 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: ext2fs_lookup.c,v 1.16 2000/08/03 20:29:26 thorpej Exp $ */ /* @@ -129,14 +129,7 @@ int ext2fs_readdir(v) void *v; { - struct vop_readdir_args /* { - struct vnode *a_vp; - struct uio *a_uio; - struct ucred *a_cred; - int **a_eofflag; - off_t **a_cookies; - int ncookies; - } */ *ap = v; + struct vop_readdir_args *ap = v; struct uio *uio = ap->a_uio; int error; size_t e2fs_count, readcnt, entries; @@ -259,11 +252,7 @@ int ext2fs_lookup(v) void *v; { - struct vop_lookup_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - } */ *ap = v; + struct vop_lookup_args *ap = v; struct vnode *vdp; /* vnode for directory being searched */ struct inode *dp; /* inode for directory being searched */ struct buf *bp; /* a buffer of directory entries */ diff --git a/sys/ufs/ext2fs/ext2fs_readwrite.c b/sys/ufs/ext2fs/ext2fs_readwrite.c index 32cf35d33a9..d1b70e6cc57 100644 --- a/sys/ufs/ext2fs/ext2fs_readwrite.c +++ b/sys/ufs/ext2fs/ext2fs_readwrite.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_readwrite.c,v 1.19 2007/05/26 20:26:51 pedro Exp $ */ +/* $OpenBSD: ext2fs_readwrite.c,v 1.20 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: ext2fs_readwrite.c,v 1.16 2001/02/27 04:37:47 chs Exp $ */ /*- @@ -65,12 +65,7 @@ int ext2fs_read(v) void *v; { - struct vop_read_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_read_args *ap = v; struct vnode *vp; struct inode *ip; struct uio *uio; @@ -163,12 +158,7 @@ int ext2fs_write(v) void *v; { - struct vop_write_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_write_args *ap = v; struct vnode *vp; struct uio *uio; struct inode *ip; diff --git a/sys/ufs/ext2fs/ext2fs_vnops.c b/sys/ufs/ext2fs/ext2fs_vnops.c index 6c3e6c2e7b2..99cb8523b27 100644 --- a/sys/ufs/ext2fs/ext2fs_vnops.c +++ b/sys/ufs/ext2fs/ext2fs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_vnops.c,v 1.46 2007/04/10 17:47:56 miod Exp $ */ +/* $OpenBSD: ext2fs_vnops.c,v 1.47 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: ext2fs_vnops.c,v 1.1 1997/06/11 09:34:09 bouyer Exp $ */ /* @@ -80,12 +80,7 @@ int ext2fs_create(v) void *v; { - struct vop_create_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - struct vattr *a_vap; - } */ *ap = v; + struct vop_create_args *ap = v; return ext2fs_makeinode(MAKEIMODE(ap->a_vap->va_type, ap->a_vap->va_mode), ap->a_dvp, ap->a_vpp, ap->a_cnp); @@ -99,12 +94,7 @@ int ext2fs_mknod(v) void *v; { - struct vop_mknod_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - struct vattr *a_vap; - } */ *ap = v; + struct vop_mknod_args *ap = v; register struct vattr *vap = ap->a_vap; register struct vnode **vpp = ap->a_vpp; register struct inode *ip; @@ -145,12 +135,7 @@ int ext2fs_open(v) void *v; { - struct vop_open_args /* { - struct vnode *a_vp; - int a_mode; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_open_args *ap = v; /* * Files marked append-only must be opened for appending. @@ -165,12 +150,7 @@ int ext2fs_access(v) void *v; { - struct vop_access_args /* { - struct vnode *a_vp; - int a_mode; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_access_args *ap = v; register struct vnode *vp = ap->a_vp; register struct inode *ip = VTOI(vp); mode_t mode = ap->a_mode; @@ -188,12 +168,7 @@ int ext2fs_getattr(v) void *v; { - struct vop_getattr_args /* { - struct vnode *a_vp; - struct vattr *a_vap; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_getattr_args *ap = v; register struct vnode *vp = ap->a_vp; register struct inode *ip = VTOI(vp); register struct vattr *vap = ap->a_vap; @@ -246,12 +221,7 @@ int ext2fs_setattr(v) void *v; { - struct vop_setattr_args /* { - struct vnode *a_vp; - struct vattr *a_vap; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_setattr_args *ap = v; register struct vattr *vap = ap->a_vap; register struct vnode *vp = ap->a_vp; register struct inode *ip = VTOI(vp); @@ -432,11 +402,7 @@ int ext2fs_remove(v) void *v; { - struct vop_remove_args /* { - struct vnode *a_dvp; - struct vnode *a_vp; - struct componentname *a_cnp; - } */ *ap = v; + struct vop_remove_args *ap = v; register struct inode *ip; register struct vnode *vp = ap->a_vp; register struct vnode *dvp = ap->a_dvp; @@ -470,11 +436,7 @@ int ext2fs_link(v) void *v; { - struct vop_link_args /* { - struct vnode *a_dvp; - struct vnode *a_vp; - struct componentname *a_cnp; - } */ *ap = v; + struct vop_link_args *ap = v; register struct vnode *dvp = ap->a_dvp; register struct vnode *vp = ap->a_vp; register struct componentname *cnp = ap->a_cnp; @@ -557,14 +519,7 @@ int ext2fs_rename(v) void *v; { - struct vop_rename_args /* { - struct vnode *a_fdvp; - struct vnode *a_fvp; - struct componentname *a_fcnp; - struct vnode *a_tdvp; - struct vnode *a_tvp; - struct componentname *a_tcnp; - } */ *ap = v; + struct vop_rename_args *ap = v; struct vnode *tvp = ap->a_tvp; register struct vnode *tdvp = ap->a_tdvp; struct vnode *fvp = ap->a_fvp; @@ -945,12 +900,7 @@ int ext2fs_mkdir(v) void *v; { - struct vop_mkdir_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - struct vattr *a_vap; - } */ *ap = v; + struct vop_mkdir_args *ap = v; register struct vnode *dvp = ap->a_dvp; register struct vattr *vap = ap->a_vap; register struct componentname *cnp = ap->a_cnp; @@ -1067,11 +1017,7 @@ int ext2fs_rmdir(v) void *v; { - struct vop_rmdir_args /* { - struct vnode *a_dvp; - struct vnode *a_vp; - struct componentname *a_cnp; - } */ *ap = v; + struct vop_rmdir_args *ap = v; register struct vnode *vp = ap->a_vp; register struct vnode *dvp = ap->a_dvp; register struct componentname *cnp = ap->a_cnp; @@ -1147,13 +1093,7 @@ int ext2fs_symlink(v) void *v; { - struct vop_symlink_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - struct vattr *a_vap; - char *a_target; - } */ *ap = v; + struct vop_symlink_args *ap = v; register struct vnode *vp, **vpp = ap->a_vpp; register struct inode *ip; int len, error; @@ -1187,11 +1127,7 @@ int ext2fs_readlink(v) void *v; { - struct vop_readlink_args /* { - struct vnode *a_vp; - struct uio *a_uio; - struct ucred *a_cred; - } */ *ap = v; + struct vop_readlink_args *ap = v; register struct vnode *vp = ap->a_vp; register struct inode *ip = VTOI(vp); int isize; @@ -1212,13 +1148,7 @@ int ext2fs_advlock(v) void *v; { - struct vop_advlock_args /* { - struct vnode *a_vp; - caddr_t a_id; - int a_op; - struct flock *a_fl; - int a_flags; - } */ *ap = v; + struct vop_advlock_args *ap = v; register struct inode *ip = VTOI(ap->a_vp); return (lf_advlock(&ip->i_lockf, ext2fs_size(ip), ap->a_id, ap->a_op, @@ -1302,12 +1232,7 @@ int ext2fs_fsync(v) void *v; { - struct vop_fsync_args /* { - struct vnode *a_vp; - struct ucred *a_cred; - int a_waitfor; - struct proc *a_p; - } */ *ap = v; + struct vop_fsync_args *ap = v; register struct vnode *vp = ap->a_vp; vflushbuf(vp, ap->a_waitfor == MNT_WAIT); @@ -1322,9 +1247,7 @@ int ext2fs_reclaim(v) void *v; { - struct vop_reclaim_args /* { - struct vnode *a_vp; - } */ *ap = v; + struct vop_reclaim_args *ap = v; register struct vnode *vp = ap->a_vp; struct inode *ip; #ifdef DIAGNOSTIC diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 02e0a9e31d0..1a3d6fad9a3 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_alloc.c,v 1.76 2007/06/01 20:23:25 pedro Exp $ */ +/* $OpenBSD: ffs_alloc.c,v 1.77 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: ffs_alloc.c,v 1.11 1996/05/11 18:27:09 mycroft Exp $ */ /* @@ -366,10 +366,7 @@ int prtrealloc = 0; int ffs1_reallocblks(void *v) { - struct vop_reallocblks_args /* { - struct vnode *a_vp; - struct cluster_save *a_buflist; - } */ *ap = v; + struct vop_reallocblks_args *ap = v; struct fs *fs; struct inode *ip; struct vnode *vp; @@ -572,10 +569,7 @@ fail: int ffs2_reallocblks(void *v) { - struct vop_reallocblks_args /* { - struct vnode *a_vp; - struct cluster_save *a_buflist; - } */ *ap = v; + struct vop_reallocblks_args *ap = v; struct fs *fs; struct inode *ip; struct vnode *vp; diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index 1cf7a53c974..a40b641c200 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_vnops.c,v 1.44 2007/05/26 20:26:51 pedro Exp $ */ +/* $OpenBSD: ffs_vnops.c,v 1.45 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: ffs_vnops.c,v 1.7 1996/05/11 18:27:24 mycroft Exp $ */ /* @@ -168,12 +168,7 @@ int doclusterwrite = 1; int ffs_read(void *v) { - struct vop_read_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_read_args *ap = v; struct vnode *vp; struct inode *ip; struct uio *uio; @@ -264,12 +259,7 @@ ffs_read(void *v) int ffs_write(void *v) { - struct vop_write_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_write_args *ap = v; struct vnode *vp; struct uio *uio; struct inode *ip; @@ -409,12 +399,7 @@ ffs_write(void *v) int ffs_fsync(void *v) { - struct vop_fsync_args /* { - struct vnode *a_vp; - struct ucred *a_cred; - int a_waitfor; - struct proc *a_p; - } */ *ap = v; + struct vop_fsync_args *ap = v; struct vnode *vp = ap->a_vp; struct buf *bp, *nbp; int s, error, passes, skipmeta; @@ -523,10 +508,7 @@ loop: int ffs_reclaim(void *v) { - struct vop_reclaim_args /* { - struct vnode *a_vp; - struct proc *a_p; - } */ *ap = v; + struct vop_reclaim_args *ap = v; struct vnode *vp = ap->a_vp; struct inode *ip = VTOI(vp); int error; diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c index 31070f7205e..63b7a2fd1aa 100644 --- a/sys/ufs/mfs/mfs_vnops.c +++ b/sys/ufs/mfs/mfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfs_vnops.c,v 1.27 2007/02/07 15:20:39 jmc Exp $ */ +/* $OpenBSD: mfs_vnops.c,v 1.28 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: mfs_vnops.c,v 1.8 1996/03/17 02:16:32 christos Exp $ */ /* @@ -105,12 +105,7 @@ int mfs_open(void *v) { #ifdef DIAGNOSTIC - struct vop_open_args /* { - struct vnode *a_vp; - int a_mode; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_open_args *ap = v; if (ap->a_vp->v_type != VBLK) { panic("mfs_open not VBLK"); @@ -128,14 +123,7 @@ int mfs_ioctl(void *v) { #if 0 - struct vop_ioctl_args /* { - struct vnode *a_vp; - u_long a_command; - caddr_t a_data; - int a_fflag; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_ioctl_args *ap = v; #endif return (ENOTTY); @@ -147,9 +135,7 @@ mfs_ioctl(void *v) int mfs_strategy(void *v) { - struct vop_strategy_args /* { - struct buf *a_bp; - } */ *ap = v; + struct vop_strategy_args *ap = v; struct buf *bp = ap->a_bp; struct mfsnode *mfsp; struct vnode *vp; @@ -212,13 +198,7 @@ mfs_doio(struct buf *bp, caddr_t base) int mfs_bmap(void *v) { - struct vop_bmap_args /* { - struct vnode *a_vp; - daddr_t a_bn; - struct vnode **a_vpp; - daddr_t *a_bnp; - int *a_runp; - } */ *ap = v; + struct vop_bmap_args *ap = v; if (ap->a_vpp != NULL) *ap->a_vpp = ap->a_vp; @@ -237,12 +217,7 @@ mfs_bmap(void *v) int mfs_close(void *v) { - struct vop_close_args /* { - struct vnode *a_vp; - int a_fflag; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_close_args *ap = v; struct vnode *vp = ap->a_vp; struct mfsnode *mfsp = VTOMFS(vp); struct buf *bp; @@ -290,10 +265,7 @@ mfs_close(void *v) int mfs_inactive(void *v) { - struct vop_inactive_args /* { - struct vnode *a_vp; - struct proc *a_p; - } */ *ap = v; + struct vop_inactive_args *ap = v; #ifdef DIAGNOSTIC struct mfsnode *mfsp = VTOMFS(ap->a_vp); @@ -311,9 +283,7 @@ mfs_inactive(void *v) int mfs_reclaim(void *v) { - struct vop_reclaim_args /* { - struct vnode *a_vp; - } */ *ap = v; + struct vop_reclaim_args *ap = v; struct vnode *vp = ap->a_vp; free(vp->v_data, M_MFSNODE); @@ -327,9 +297,7 @@ mfs_reclaim(void *v) int mfs_print(void *v) { - struct vop_print_args /* { - struct vnode *a_vp; - } */ *ap = v; + struct vop_print_args *ap = v; struct mfsnode *mfsp = VTOMFS(ap->a_vp); printf("tag VT_MFS, pid %d, base %p, size %ld\n", mfsp->mfs_pid, diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c index 3cab7cf0af5..5f1d3f1bbe0 100644 --- a/sys/ufs/ufs/ufs_bmap.c +++ b/sys/ufs/ufs/ufs_bmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs_bmap.c,v 1.24 2007/06/01 07:44:27 otto Exp $ */ +/* $OpenBSD: ufs_bmap.c,v 1.25 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: ufs_bmap.c,v 1.3 1996/02/09 22:36:00 christos Exp $ */ /* @@ -60,13 +60,8 @@ int ufs_bmap(void *v) { - struct vop_bmap_args /* { - struct vnode *a_vp; - daddr64_t a_bn; - struct vnode **a_vpp; - daddr64_t *a_bnp; - int *a_runp; - } */ *ap = v; + struct vop_bmap_args *ap = v; + /* * Check for underlying vnode requests and ensure that logical * to physical mapping is requested. diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c index 8188f4750c0..e4a92ef999c 100644 --- a/sys/ufs/ufs/ufs_inode.c +++ b/sys/ufs/ufs/ufs_inode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs_inode.c,v 1.36 2007/04/11 16:08:50 thib Exp $ */ +/* $OpenBSD: ufs_inode.c,v 1.37 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: ufs_inode.c,v 1.7 1996/05/11 18:27:52 mycroft Exp $ */ /* @@ -61,10 +61,7 @@ int ufs_inactive(void *v) { - struct vop_inactive_args /* { - struct vnode *a_vp; - struct proc *a_p; - } */ *ap = v; + struct vop_inactive_args *ap = v; struct vnode *vp = ap->a_vp; struct inode *ip = VTOI(vp); struct proc *p = ap->a_p; diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c index ca107492158..75e4789af69 100644 --- a/sys/ufs/ufs/ufs_lookup.c +++ b/sys/ufs/ufs/ufs_lookup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs_lookup.c,v 1.36 2006/11/17 11:09:00 pedro Exp $ */ +/* $OpenBSD: ufs_lookup.c,v 1.37 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: ufs_lookup.c,v 1.7 1996/02/09 22:36:06 christos Exp $ */ /* @@ -104,11 +104,7 @@ int dirchk = 0; int ufs_lookup(void *v) { - struct vop_lookup_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - } */ *ap = v; + struct vop_lookup_args *ap = v; struct vnode *vdp; /* vnode for directory being searched */ struct inode *dp; /* inode for directory being searched */ struct buf *bp; /* a buffer of directory entries */ diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index d28a0ce43a9..1761fed6c56 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs_vnops.c,v 1.80 2007/05/17 23:46:28 thib Exp $ */ +/* $OpenBSD: ufs_vnops.c,v 1.81 2007/06/01 23:47:57 deraadt Exp $ */ /* $NetBSD: ufs_vnops.c,v 1.18 1996/05/11 18:28:04 mycroft Exp $ */ /* @@ -114,12 +114,7 @@ static struct odirtemplate omastertemplate = { int ufs_create(void *v) { - struct vop_create_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - struct vattr *a_vap; - } */ *ap = v; + struct vop_create_args *ap = v; int error; error = @@ -138,12 +133,7 @@ ufs_create(void *v) int ufs_mknod(void *v) { - struct vop_mknod_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - struct vattr *a_vap; - } */ *ap = v; + struct vop_mknod_args *ap = v; struct vattr *vap = ap->a_vap; struct vnode **vpp = ap->a_vpp; struct inode *ip; @@ -184,12 +174,7 @@ ufs_mknod(void *v) int ufs_open(void *v) { - struct vop_open_args /* { - struct vnode *a_vp; - int a_mode; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_open_args *ap = v; struct inode *ip = VTOI(ap->a_vp); /* @@ -214,12 +199,7 @@ ufs_open(void *v) int ufs_close(void *v) { - struct vop_close_args /* { - struct vnode *a_vp; - int a_fflag; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_close_args *ap = v; struct vnode *vp = ap->a_vp; struct inode *ip = VTOI(vp); @@ -235,12 +215,7 @@ ufs_close(void *v) int ufs_access(void *v) { - struct vop_access_args /* { - struct vnode *a_vp; - int a_mode; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_access_args *ap = v; struct vnode *vp = ap->a_vp; struct inode *ip = VTOI(vp); mode_t mode = ap->a_mode; @@ -285,12 +260,7 @@ ufs_access(void *v) int ufs_getattr(void *v) { - struct vop_getattr_args /* { - struct vnode *a_vp; - struct vattr *a_vap; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_getattr_args *ap = v; struct vnode *vp = ap->a_vp; struct inode *ip = VTOI(vp); struct vattr *vap = ap->a_vap; @@ -336,12 +306,7 @@ ufs_getattr(void *v) int ufs_setattr(void *v) { - struct vop_setattr_args /* { - struct vnode *a_vp; - struct vattr *a_vap; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_setattr_args *ap = v; struct vattr *vap = ap->a_vap; struct vnode *vp = ap->a_vp; struct inode *ip = VTOI(vp); @@ -564,14 +529,7 @@ int ufs_ioctl(void *v) { #if 0 - struct vop_ioctl_args /* { - struct vnode *a_vp; - u_long a_command; - caddr_t a_data; - int a_fflag; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_ioctl_args *ap = v; #endif return (ENOTTY); } @@ -580,11 +538,7 @@ ufs_ioctl(void *v) int ufs_poll(void *v) { - struct vop_poll_args /* { - struct vnode *a_vp; - int a_events; - struct proc *a_p; - } */ *ap = v; + struct vop_poll_args *ap = v; /* * We should really check to see if I/O is possible. @@ -595,11 +549,7 @@ ufs_poll(void *v) int ufs_remove(void *v) { - struct vop_remove_args /* { - struct vnode *a_dvp; - struct vnode *a_vp; - struct componentname *a_cnp; - } */ *ap = v; + struct vop_remove_args *ap = v; struct inode *ip; struct vnode *vp = ap->a_vp; struct vnode *dvp = ap->a_dvp; @@ -629,11 +579,7 @@ ufs_remove(void *v) int ufs_link(void *v) { - struct vop_link_args /* { - struct vnode *a_dvp; - struct vnode *a_vp; - struct componentname *a_cnp; - } */ *ap = v; + struct vop_link_args *ap = v; struct vnode *dvp = ap->a_dvp; struct vnode *vp = ap->a_vp; struct componentname *cnp = ap->a_cnp; @@ -725,14 +671,7 @@ out2: int ufs_rename(void *v) { - struct vop_rename_args /* { - struct vnode *a_fdvp; - struct vnode *a_fvp; - struct componentname *a_fcnp; - struct vnode *a_tdvp; - struct vnode *a_tvp; - struct componentname *a_tcnp; - } */ *ap = v; + struct vop_rename_args *ap = v; struct vnode *tvp = ap->a_tvp; struct vnode *tdvp = ap->a_tdvp; struct vnode *fvp = ap->a_fvp; @@ -1147,12 +1086,7 @@ out: int ufs_mkdir(void *v) { - struct vop_mkdir_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - struct vattr *a_vap; - } */ *ap = v; + struct vop_mkdir_args *ap = v; struct vnode *dvp = ap->a_dvp; struct vattr *vap = ap->a_vap; struct componentname *cnp = ap->a_cnp; @@ -1304,11 +1238,7 @@ out: int ufs_rmdir(void *v) { - struct vop_rmdir_args /* { - struct vnode *a_dvp; - struct vnode *a_vp; - struct componentname *a_cnp; - } */ *ap = v; + struct vop_rmdir_args *ap = v; struct vnode *vp = ap->a_vp; struct vnode *dvp = ap->a_dvp; struct componentname *cnp = ap->a_cnp; @@ -1409,13 +1339,7 @@ out: int ufs_symlink(void *v) { - struct vop_symlink_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - struct vattr *a_vap; - char *a_target; - } */ *ap = v; + struct vop_symlink_args *ap = v; struct vnode *vp, **vpp = ap->a_vpp; struct inode *ip; int len, error; @@ -1452,14 +1376,7 @@ ufs_symlink(void *v) int ufs_readdir(void *v) { - struct vop_readdir_args /* { - struct vnode *a_vp; - struct uio *a_uio; - struct ucred *a_cred; - int *a_eofflag; - u_long **a_cookies; - int *ncookies; - } */ *ap = v; + struct vop_readdir_args *ap = v; struct uio *uio = ap->a_uio; int error; size_t count, lost, entries; @@ -1569,11 +1486,7 @@ ufs_readdir(void *v) int ufs_readlink(void *v) { - struct vop_readlink_args /* { - struct vnode *a_vp; - struct uio *a_uio; - struct ucred *a_cred; - } */ *ap = v; + struct vop_readlink_args *ap = v; struct vnode *vp = ap->a_vp; struct inode *ip = VTOI(vp); int isize; @@ -1593,11 +1506,7 @@ ufs_readlink(void *v) int ufs_lock(void *v) { - struct vop_lock_args /* { - struct vnode *a_vp; - int a_flags; - struct proc *a_p; - } */ *ap = v; + struct vop_lock_args *ap = v; struct vnode *vp = ap->a_vp; return (lockmgr(&VTOI(vp)->i_lock, ap->a_flags, NULL)); @@ -1609,11 +1518,7 @@ ufs_lock(void *v) int ufs_unlock(void *v) { - struct vop_unlock_args /* { - struct vnode *a_vp; - int a_flags; - struct proc *a_p; - } */ *ap = v; + struct vop_unlock_args *ap = v; struct vnode *vp = ap->a_vp; return (lockmgr(&VTOI(vp)->i_lock, ap->a_flags | LK_RELEASE, NULL)); @@ -1625,9 +1530,7 @@ ufs_unlock(void *v) int ufs_islocked(void *v) { - struct vop_islocked_args /* { - struct vnode *a_vp; - } */ *ap = v; + struct vop_islocked_args *ap = v; return (lockstatus(&VTOI(ap->a_vp)->i_lock)); } @@ -1639,9 +1542,7 @@ ufs_islocked(void *v) int ufs_strategy(void *v) { - struct vop_strategy_args /* { - struct buf *a_bp; - } */ *ap = v; + struct vop_strategy_args *ap = v; struct buf *bp = ap->a_bp; struct vnode *vp = bp->b_vp; struct inode *ip; @@ -1684,9 +1585,7 @@ int ufs_print(void *v) { #ifdef DIAGNOSTIC - struct vop_print_args /* { - struct vnode *a_vp; - } */ *ap = v; + struct vop_print_args *ap = v; struct vnode *vp = ap->a_vp; struct inode *ip = VTOI(vp); @@ -1716,12 +1615,7 @@ ufs_print(void *v) int ufsspec_read(void *v) { - struct vop_read_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_read_args *ap = v; /* * Set access flag. @@ -1736,12 +1630,7 @@ ufsspec_read(void *v) int ufsspec_write(void *v) { - struct vop_write_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_write_args *ap = v; /* * Set update and change flags. @@ -1758,12 +1647,7 @@ ufsspec_write(void *v) int ufsspec_close(void *v) { - struct vop_close_args /* { - struct vnode *a_vp; - int a_fflag; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_close_args *ap = v; struct vnode *vp = ap->a_vp; struct inode *ip = VTOI(vp); @@ -1783,12 +1667,7 @@ ufsspec_close(void *v) int ufsfifo_read(void *v) { - struct vop_read_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_read_args *ap = v; extern int (**fifo_vnodeop_p)(void *); /* @@ -1804,12 +1683,7 @@ ufsfifo_read(void *v) int ufsfifo_write(void *v) { - struct vop_write_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap = v; + struct vop_write_args *ap = v; extern int (**fifo_vnodeop_p)(void *); /* @@ -1827,12 +1701,7 @@ ufsfifo_write(void *v) int ufsfifo_close(void *v) { - struct vop_close_args /* { - struct vnode *a_vp; - int a_fflag; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; + struct vop_close_args *ap = v; extern int (**fifo_vnodeop_p)(void *); struct vnode *vp = ap->a_vp; struct inode *ip = VTOI(vp); @@ -1853,11 +1722,7 @@ ufsfifo_close(void *v) int ufs_pathconf(void *v) { - struct vop_pathconf_args /* { - struct vnode *a_vp; - int a_name; - register_t *a_retval; - } */ *ap = v; + struct vop_pathconf_args *ap = v; switch (ap->a_name) { case _PC_LINK_MAX: @@ -1890,13 +1755,7 @@ ufs_pathconf(void *v) int ufs_advlock(void *v) { - struct vop_advlock_args /* { - struct vnode *a_vp; - caddr_t a_id; - int a_op; - struct flock *a_fl; - int a_flags; - } */ *ap = v; + struct vop_advlock_args *ap = v; struct inode *ip = VTOI(ap->a_vp); return (lf_advlock(&ip->i_lockf, DIP(ip, size), ap->a_id, ap->a_op, @@ -2066,10 +1925,7 @@ struct filterops ufsvnode_filtops = int ufs_kqfilter(void *v) { - struct vop_kqfilter_args /* { - struct vnode *a_vp; - struct knote *a_kn; - } */ *ap = v; + struct vop_kqfilter_args *ap = v; struct vnode *vp = ap->a_vp; struct knote *kn = ap->a_kn; diff --git a/sys/xfs/xfs_vnodeops-bsd.c b/sys/xfs/xfs_vnodeops-bsd.c index 90459965856..4fc2a70ed8f 100644 --- a/sys/xfs/xfs_vnodeops-bsd.c +++ b/sys/xfs/xfs_vnodeops-bsd.c @@ -1173,9 +1173,7 @@ xfs_cntl(struct vnode * vp, int xfs_print (struct vop_print_args *v) { - struct vop_print_args /* { - struct vnode *a_vp; - } */ *ap = v; + struct vop_print_args *ap = v; xfs_printnode_common (ap->a_vp); return 0; } @@ -1185,13 +1183,7 @@ xfs_print (struct vop_print_args *v) int xfs_advlock(struct vop_advlock_args *v) { - struct vop_advlock_args /* { - struct vnode *a_vp; - caddr_t a_id; - int a_op; - struct flock *a_fl; - int a_flags; - } */ *ap = v; + struct vop_advlock_args *ap = v; #if defined(HAVE_KERNEL_LF_ADVLOCK) && !defined(__APPLE__) struct xfs_node *xn = VNODE_TO_XNODE(ap->a_vp); |