diff options
author | Todd C. Miller <millert@cvs.openbsd.org> | 2002-03-14 01:27:20 +0000 |
---|---|---|
committer | Todd C. Miller <millert@cvs.openbsd.org> | 2002-03-14 01:27:20 +0000 |
commit | 8327d0774703553db5e1a41a04bfdf4b1797c2ce (patch) | |
tree | ac9a52bace179e17769651fb9f805070d78abe5f /sys/nfs/nfs_var.h | |
parent | 7b2c79b5895287d37f0c4e3adfc396eb7a6c03fb (diff) |
First round of __P removal in sys
Diffstat (limited to 'sys/nfs/nfs_var.h')
-rw-r--r-- | sys/nfs/nfs_var.h | 396 |
1 files changed, 198 insertions, 198 deletions
diff --git a/sys/nfs/nfs_var.h b/sys/nfs/nfs_var.h index bf2c5376815..84c58a7fc88 100644 --- a/sys/nfs/nfs_var.h +++ b/sys/nfs/nfs_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_var.h,v 1.17 2001/12/19 08:58:06 art Exp $ */ +/* $OpenBSD: nfs_var.h,v 1.18 2002/03/14 01:27:13 millert Exp $ */ /* $NetBSD: nfs_var.h,v 1.3 1996/02/18 11:53:54 fvdl Exp $ */ /* @@ -61,221 +61,221 @@ struct nfs_fattr; union nethostaddr; /* nfs_bio.c */ -int nfs_bioread __P((struct vnode *, struct uio *, int, struct ucred *)); -int nfs_write __P((void *)); -struct buf *nfs_getcacheblk __P((struct vnode *, daddr_t, int, struct proc *)); -int nfs_vinvalbuf __P((struct vnode *, int, struct ucred *, struct proc *, - int)); -int nfs_asyncio __P((struct buf *)); -int nfs_doio __P((struct buf *, struct proc *)); +int nfs_bioread(struct vnode *, struct uio *, int, struct ucred *); +int nfs_write(void *); +struct buf *nfs_getcacheblk(struct vnode *, daddr_t, int, struct proc *); +int nfs_vinvalbuf(struct vnode *, int, struct ucred *, struct proc *, + int); +int nfs_asyncio(struct buf *); +int nfs_doio(struct buf *, struct proc *); /* nfs_boot.c */ -int nfs_boot_init __P((struct nfs_diskless *, struct proc *)); -int nfs_boot_init __P((struct nfs_diskless *, struct proc *)); +int nfs_boot_init(struct nfs_diskless *, struct proc *); +int nfs_boot_init(struct nfs_diskless *, struct proc *); /* nfs_node.c */ -void nfs_nhinit __P((void)); -u_long nfs_hash __P((nfsfh_t *, int)); -int nfs_nget __P((struct mount *, nfsfh_t *, int, struct nfsnode **)); -int nfs_inactive __P((void *)); -int nfs_reclaim __P((void *)); +void nfs_nhinit(void); +u_long nfs_hash(nfsfh_t *, int); +int nfs_nget(struct mount *, nfsfh_t *, int, struct nfsnode **); +int nfs_inactive(void *); +int nfs_reclaim(void *); /* nfs_vnops.c */ -int nfs_null __P((struct vnode *, struct ucred *, struct proc *)); -int nfs_access __P((void *)); -int nfs_open __P((void *)); -int nfs_close __P((void *)); -int nfs_getattr __P((void *)); -int nfs_setattr __P((void *)); -int nfs_setattrrpc __P((struct vnode *, struct vattr *, struct ucred *, - struct proc *)); -int nfs_lookup __P((void *)); -int nfs_read __P((void *)); -int nfs_readlink __P((void *)); -int nfs_readlinkrpc __P((struct vnode *, struct uio *, struct ucred *)); -int nfs_readrpc __P((struct vnode *, struct uio *)); -int nfs_writerpc __P((struct vnode *, struct uio *, int *, int *)); -int nfs_mknodrpc __P((struct vnode *, struct vnode **, struct componentname *, - struct vattr *)); -int nfs_mknod __P((void *)); -int nfs_create __P((void *)); -int nfs_remove __P((void *)); -int nfs_removeit __P((struct sillyrename *)); -int nfs_removerpc __P((struct vnode *, char *, int, struct ucred *, - struct proc *)); -int nfs_rename __P((void *)); -int nfs_renameit __P((struct vnode *, struct componentname *, - struct sillyrename *)); -int nfs_renamerpc __P((struct vnode *, char *, int, struct vnode *, char *, int, - struct ucred *, struct proc *)); -int nfs_link __P((void *)); -int nfs_symlink __P((void *)); -int nfs_mkdir __P((void *)); -int nfs_rmdir __P((void *)); -int nfs_readdir __P((void *)); +int nfs_null(struct vnode *, struct ucred *, struct proc *); +int nfs_access(void *); +int nfs_open(void *); +int nfs_close(void *); +int nfs_getattr(void *); +int nfs_setattr(void *); +int nfs_setattrrpc(struct vnode *, struct vattr *, struct ucred *, + struct proc *); +int nfs_lookup(void *); +int nfs_read(void *); +int nfs_readlink(void *); +int nfs_readlinkrpc(struct vnode *, struct uio *, struct ucred *); +int nfs_readrpc(struct vnode *, struct uio *); +int nfs_writerpc(struct vnode *, struct uio *, int *, int *); +int nfs_mknodrpc(struct vnode *, struct vnode **, struct componentname *, + struct vattr *); +int nfs_mknod(void *); +int nfs_create(void *); +int nfs_remove(void *); +int nfs_removeit(struct sillyrename *); +int nfs_removerpc(struct vnode *, char *, int, struct ucred *, + struct proc *); +int nfs_rename(void *); +int nfs_renameit(struct vnode *, struct componentname *, + struct sillyrename *); +int nfs_renamerpc(struct vnode *, char *, int, struct vnode *, char *, int, + struct ucred *, struct proc *); +int nfs_link(void *); +int nfs_symlink(void *); +int nfs_mkdir(void *); +int nfs_rmdir(void *); +int nfs_readdir(void *); int nfs_readdirrpc(struct vnode *, struct uio *, struct ucred *, int *); int nfs_readdirplusrpc(struct vnode *, struct uio *, struct ucred *, int *); -int nfs_sillyrename __P((struct vnode *, struct vnode *, - struct componentname *)); -int nfs_lookitup __P((struct vnode *, char *, int, struct ucred *, - struct proc *, struct nfsnode **)); -int nfs_commit __P((struct vnode *, u_quad_t, int, struct proc *)); -int nfs_bmap __P((void *)); -int nfs_strategy __P((void *)); -int nfs_mmap __P((void *)); -int nfs_fsync __P((void *)); -int nfs_flush __P((struct vnode *, struct ucred *, int, struct proc *, int)); -int nfs_pathconf __P((void *)); -int nfs_advlock __P((void *)); -int nfs_print __P((void *)); -int nfs_blkatoff __P((void *)); -int nfs_valloc __P((void *)); -int nfs_vfree __P((void *)); -int nfs_truncate __P((void *)); -int nfs_update __P((void *)); -int nfs_bwrite __P((void *)); -int nfs_writebp __P((struct buf *, int)); -int nfsspec_access __P((void *)); -int nfsspec_read __P((void *)); -int nfsspec_write __P((void *)); -int nfsspec_close __P((void *)); -int nfsfifo_read __P((void *)); -int nfsfifo_write __P((void *)); -int nfsfifo_close __P((void *)); +int nfs_sillyrename(struct vnode *, struct vnode *, + struct componentname *); +int nfs_lookitup(struct vnode *, char *, int, struct ucred *, + struct proc *, struct nfsnode **); +int nfs_commit(struct vnode *, u_quad_t, int, struct proc *); +int nfs_bmap(void *); +int nfs_strategy(void *); +int nfs_mmap(void *); +int nfs_fsync(void *); +int nfs_flush(struct vnode *, struct ucred *, int, struct proc *, int); +int nfs_pathconf(void *); +int nfs_advlock(void *); +int nfs_print(void *); +int nfs_blkatoff(void *); +int nfs_valloc(void *); +int nfs_vfree(void *); +int nfs_truncate(void *); +int nfs_update(void *); +int nfs_bwrite(void *); +int nfs_writebp(struct buf *, int); +int nfsspec_access(void *); +int nfsspec_read(void *); +int nfsspec_write(void *); +int nfsspec_close(void *); +int nfsfifo_read(void *); +int nfsfifo_write(void *); +int nfsfifo_close(void *); /* nfs_serv.c */ -int nfsrv3_access __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct proc *, struct mbuf **)); -int nfsrv_getattr __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct proc *, struct mbuf **)); -int nfsrv_setattr __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct proc *, struct mbuf **)); -int nfsrv_lookup __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct proc *, struct mbuf **)); -int nfsrv_readlink __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct proc *, struct mbuf **)); -int nfsrv_read __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct proc *, struct mbuf **)); -int nfsrv_write __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct proc *, struct mbuf **)); -int nfsrv_writegather __P((struct nfsrv_descript **, struct nfssvc_sock *, - struct proc *, struct mbuf **)); -void nfsrvw_coalesce __P((struct nfsrv_descript *, struct nfsrv_descript *)); -int nfsrv_create __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct proc *, struct mbuf **)); -int nfsrv_mknod __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct proc *, struct mbuf **)); -int nfsrv_remove __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct proc *, struct mbuf **)); -int nfsrv_rename __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct proc *, struct mbuf **)); -int nfsrv_link __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct proc *, struct mbuf **)); -int nfsrv_symlink __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct proc *, struct mbuf **)); -int nfsrv_mkdir __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct proc *, struct mbuf **)); -int nfsrv_rmdir __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct proc *, struct mbuf **)); -int nfsrv_readdir __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct proc *, struct mbuf **)); -int nfsrv_readdirplus __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct proc *, struct mbuf **)); -int nfsrv_commit __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct proc *, struct mbuf **)); -int nfsrv_statfs __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct proc *, struct mbuf **)); -int nfsrv_fsinfo __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct proc *, struct mbuf **)); -int nfsrv_pathconf __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct proc *, struct mbuf **)); -int nfsrv_null __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct proc *, struct mbuf **)); -int nfsrv_noop __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct proc *, struct mbuf **)); -int nfsrv_access __P((struct vnode *, int, struct ucred *, int, struct proc *, - int)); +int nfsrv3_access(struct nfsrv_descript *, struct nfssvc_sock *, + struct proc *, struct mbuf **); +int nfsrv_getattr(struct nfsrv_descript *, struct nfssvc_sock *, + struct proc *, struct mbuf **); +int nfsrv_setattr(struct nfsrv_descript *, struct nfssvc_sock *, + struct proc *, struct mbuf **); +int nfsrv_lookup(struct nfsrv_descript *, struct nfssvc_sock *, + struct proc *, struct mbuf **); +int nfsrv_readlink(struct nfsrv_descript *, struct nfssvc_sock *, + struct proc *, struct mbuf **); +int nfsrv_read(struct nfsrv_descript *, struct nfssvc_sock *, + struct proc *, struct mbuf **); +int nfsrv_write(struct nfsrv_descript *, struct nfssvc_sock *, + struct proc *, struct mbuf **); +int nfsrv_writegather(struct nfsrv_descript **, struct nfssvc_sock *, + struct proc *, struct mbuf **); +void nfsrvw_coalesce(struct nfsrv_descript *, struct nfsrv_descript *); +int nfsrv_create(struct nfsrv_descript *, struct nfssvc_sock *, + struct proc *, struct mbuf **); +int nfsrv_mknod(struct nfsrv_descript *, struct nfssvc_sock *, + struct proc *, struct mbuf **); +int nfsrv_remove(struct nfsrv_descript *, struct nfssvc_sock *, + struct proc *, struct mbuf **); +int nfsrv_rename(struct nfsrv_descript *, struct nfssvc_sock *, + struct proc *, struct mbuf **); +int nfsrv_link(struct nfsrv_descript *, struct nfssvc_sock *, + struct proc *, struct mbuf **); +int nfsrv_symlink(struct nfsrv_descript *, struct nfssvc_sock *, + struct proc *, struct mbuf **); +int nfsrv_mkdir(struct nfsrv_descript *, struct nfssvc_sock *, + struct proc *, struct mbuf **); +int nfsrv_rmdir(struct nfsrv_descript *, struct nfssvc_sock *, + struct proc *, struct mbuf **); +int nfsrv_readdir(struct nfsrv_descript *, struct nfssvc_sock *, + struct proc *, struct mbuf **); +int nfsrv_readdirplus(struct nfsrv_descript *, struct nfssvc_sock *, + struct proc *, struct mbuf **); +int nfsrv_commit(struct nfsrv_descript *, struct nfssvc_sock *, + struct proc *, struct mbuf **); +int nfsrv_statfs(struct nfsrv_descript *, struct nfssvc_sock *, + struct proc *, struct mbuf **); +int nfsrv_fsinfo(struct nfsrv_descript *, struct nfssvc_sock *, + struct proc *, struct mbuf **); +int nfsrv_pathconf(struct nfsrv_descript *, struct nfssvc_sock *, + struct proc *, struct mbuf **); +int nfsrv_null(struct nfsrv_descript *, struct nfssvc_sock *, + struct proc *, struct mbuf **); +int nfsrv_noop(struct nfsrv_descript *, struct nfssvc_sock *, + struct proc *, struct mbuf **); +int nfsrv_access(struct vnode *, int, struct ucred *, int, struct proc *, + int); /* nfs_socket.c */ -int nfs_connect __P((struct nfsmount *, struct nfsreq *)); -int nfs_reconnect __P((struct nfsreq *)); -void nfs_disconnect __P((struct nfsmount *)); -int nfs_send __P((struct socket *, struct mbuf *, struct mbuf *, - struct nfsreq *)); -int nfs_receive __P((struct nfsreq *, struct mbuf **, struct mbuf **)); -int nfs_reply __P((struct nfsreq *)); -int nfs_request __P((struct vnode *, struct mbuf *, int, struct proc *, +int nfs_connect(struct nfsmount *, struct nfsreq *); +int nfs_reconnect(struct nfsreq *); +void nfs_disconnect(struct nfsmount *); +int nfs_send(struct socket *, struct mbuf *, struct mbuf *, + struct nfsreq *); +int nfs_receive(struct nfsreq *, struct mbuf **, struct mbuf **); +int nfs_reply(struct nfsreq *); +int nfs_request(struct vnode *, struct mbuf *, int, struct proc *, struct ucred *, struct mbuf **, struct mbuf **, - caddr_t *)); -int nfs_rephead __P((int, struct nfsrv_descript *, struct nfssvc_sock *, - int, int, u_quad_t *, struct mbuf **, struct mbuf **, caddr_t *)); -void nfs_timer __P((void *)); -int nfs_sigintr __P((struct nfsmount *, struct nfsreq *, struct proc *)); -int nfs_sndlock __P((int *, struct nfsreq *)); -void nfs_sndunlock __P((int *)); -int nfs_rcvlock __P((struct nfsreq *)); -void nfs_rcvunlock __P((int *)); -void nfs_realign __P((struct mbuf *, int)); -int nfs_getreq __P((struct nfsrv_descript *, struct nfsd *, int)); -int nfs_msg __P((struct proc *, char *, char *)); -void nfsrv_rcv __P((struct socket *, caddr_t, int)); -int nfsrv_getstream __P((struct nfssvc_sock *, int)); -int nfsrv_dorec __P((struct nfssvc_sock *, struct nfsd *, - struct nfsrv_descript **)); -void nfsrv_wakenfsd __P((struct nfssvc_sock *)); + caddr_t *); +int nfs_rephead(int, struct nfsrv_descript *, struct nfssvc_sock *, + int, int, u_quad_t *, struct mbuf **, struct mbuf **, caddr_t *); +void nfs_timer(void *); +int nfs_sigintr(struct nfsmount *, struct nfsreq *, struct proc *); +int nfs_sndlock(int *, struct nfsreq *); +void nfs_sndunlock(int *); +int nfs_rcvlock(struct nfsreq *); +void nfs_rcvunlock(int *); +void nfs_realign(struct mbuf *, int); +int nfs_getreq(struct nfsrv_descript *, struct nfsd *, int); +int nfs_msg(struct proc *, char *, char *); +void nfsrv_rcv(struct socket *, caddr_t, int); +int nfsrv_getstream(struct nfssvc_sock *, int); +int nfsrv_dorec(struct nfssvc_sock *, struct nfsd *, + struct nfsrv_descript **); +void nfsrv_wakenfsd(struct nfssvc_sock *); /* nfs_srvcache.c */ -void nfsrv_initcache __P((void )); -int nfsrv_getcache __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct mbuf **)); -void nfsrv_updatecache __P((struct nfsrv_descript *, int, struct mbuf *)); -void nfsrv_cleancache __P((void)); +void nfsrv_initcache(void ); +int nfsrv_getcache(struct nfsrv_descript *, struct nfssvc_sock *, + struct mbuf **); +void nfsrv_updatecache(struct nfsrv_descript *, int, struct mbuf *); +void nfsrv_cleancache(void); /* nfs_subs.c */ -struct mbuf *nfsm_reqh __P((struct vnode *, u_long, int, caddr_t *)); -struct mbuf *nfsm_rpchead __P((struct ucred *, int, int, int, int, char *, int, +struct mbuf *nfsm_reqh(struct vnode *, u_long, int, caddr_t *); +struct mbuf *nfsm_rpchead(struct ucred *, int, int, int, int, char *, int, char *, struct mbuf *, int, struct mbuf **, - u_int32_t *)); -int nfsm_mbuftouio __P((struct mbuf **, struct uio *, int, caddr_t *)); -int nfsm_uiotombuf __P((struct uio *, struct mbuf **, int, caddr_t *)); -int nfsm_disct __P((struct mbuf **, caddr_t *, int, int, caddr_t *)); -int nfs_adv __P((struct mbuf **, caddr_t *, int, int)); -int nfsm_strtmbuf __P((struct mbuf **, char **, char *, long)); -int nfs_vfs_init __P((struct vfsconf *)); -int nfs_loadattrcache __P((struct vnode **, struct mbuf **, caddr_t *, - struct vattr *)); -int nfs_getattrcache __P((struct vnode *, struct vattr *)); -int nfs_namei __P((struct nameidata *, fhandle_t *, int, struct nfssvc_sock *, + u_int32_t *); +int nfsm_mbuftouio(struct mbuf **, struct uio *, int, caddr_t *); +int nfsm_uiotombuf(struct uio *, struct mbuf **, int, caddr_t *); +int nfsm_disct(struct mbuf **, caddr_t *, int, int, caddr_t *); +int nfs_adv(struct mbuf **, caddr_t *, int, int); +int nfsm_strtmbuf(struct mbuf **, char **, char *, long); +int nfs_vfs_init(struct vfsconf *); +int nfs_loadattrcache(struct vnode **, struct mbuf **, caddr_t *, + struct vattr *); +int nfs_getattrcache(struct vnode *, struct vattr *); +int nfs_namei(struct nameidata *, fhandle_t *, int, struct nfssvc_sock *, struct mbuf *, struct mbuf **, caddr_t *, struct vnode **, - struct proc *, int)); -void nfsm_adj __P((struct mbuf *, int, int)); -void nfsm_srvwcc __P((struct nfsrv_descript *, int, struct vattr *, int, - struct vattr *, struct mbuf **, char **)); -void nfsm_srvpostopattr __P((struct nfsrv_descript *, int, struct vattr *, - struct mbuf **, char **)); -void nfsm_srvfattr __P((struct nfsrv_descript *, struct vattr *, - struct nfs_fattr *)); -int nfsrv_fhtovp __P((fhandle_t *, int, struct vnode **, struct ucred *, - struct nfssvc_sock *, struct mbuf *, int *, int)); -int netaddr_match __P((int, union nethostaddr *, struct mbuf *)); -void nfs_clearcommit __P((struct mount *)); -int nfsrv_errmap __P((struct nfsrv_descript *, int)); -void nfsrvw_sort __P((gid_t *, int)); -void nfsrv_setcred __P((struct ucred *, struct ucred *)); + struct proc *, int); +void nfsm_adj(struct mbuf *, int, int); +void nfsm_srvwcc(struct nfsrv_descript *, int, struct vattr *, int, + struct vattr *, struct mbuf **, char **); +void nfsm_srvpostopattr(struct nfsrv_descript *, int, struct vattr *, + struct mbuf **, char **); +void nfsm_srvfattr(struct nfsrv_descript *, struct vattr *, + struct nfs_fattr *); +int nfsrv_fhtovp(fhandle_t *, int, struct vnode **, struct ucred *, + struct nfssvc_sock *, struct mbuf *, int *, int); +int netaddr_match(int, union nethostaddr *, struct mbuf *); +void nfs_clearcommit(struct mount *); +int nfsrv_errmap(struct nfsrv_descript *, int); +void nfsrvw_sort(gid_t *, int); +void nfsrv_setcred(struct ucred *, struct ucred *); /* nfs_syscalls.c */ -int sys_nfssvc __P((struct proc *, void *, register_t *)); -int nfssvc_addsock __P((struct file *, struct mbuf *)); -int nfssvc_nfsd __P((struct nfsd_srvargs *, caddr_t, struct proc *)); -void nfsrv_zapsock __P((struct nfssvc_sock *)); -void nfsrv_slpderef __P((struct nfssvc_sock *)); -void nfsrv_init __P((int)); -int nfssvc_iod __P((struct proc *)); -void start_nfsio __P((void *)); -void nfs_getset_niothreads __P((int)); -int nfs_getauth __P((struct nfsmount *, struct nfsreq *, struct ucred *, - char **, int *, char *, int *, NFSKERBKEY_T)); -int nfs_getnickauth __P((struct nfsmount *, struct ucred *, char **, int *, - char *, int)); -int nfs_savenickauth __P((struct nfsmount *, struct ucred *, int, NFSKERBKEY_T, - struct mbuf **, char **, struct mbuf *)); +int sys_nfssvc(struct proc *, void *, register_t *); +int nfssvc_addsock(struct file *, struct mbuf *); +int nfssvc_nfsd(struct nfsd_srvargs *, caddr_t, struct proc *); +void nfsrv_zapsock(struct nfssvc_sock *); +void nfsrv_slpderef(struct nfssvc_sock *); +void nfsrv_init(int); +int nfssvc_iod(struct proc *); +void start_nfsio(void *); +void nfs_getset_niothreads(int); +int nfs_getauth(struct nfsmount *, struct nfsreq *, struct ucred *, + char **, int *, char *, int *, NFSKERBKEY_T); +int nfs_getnickauth(struct nfsmount *, struct ucred *, char **, int *, + char *, int); +int nfs_savenickauth(struct nfsmount *, struct ucred *, int, NFSKERBKEY_T, + struct mbuf **, char **, struct mbuf *); |