37c37
< * $Id: nfs.h,v 1.28 1997/06/03 17:22:45 dfr Exp $
---
> * $Id: nfs.h,v 1.29 1997/07/16 09:06:27 dfr Exp $
385c385
< struct mbuf *had_nam;
---
> struct sockaddr *had_nam;
409c409
< struct mbuf *nr_address;
---
> struct sockaddr *nr_address;
418c418
< struct mbuf *ns_nam;
---
> struct sockaddr *ns_nam;
483,484c483,484
< struct mbuf *nd_nam; /* and socket addr */
< struct mbuf *nd_nam2; /* return socket addr */
---
> struct sockaddr *nd_nam; /* and socket addr */
> struct sockaddr *nd_nam2; /* return socket addr */
570,572c570,575
< int nfs_send __P((struct socket *,struct mbuf *,struct mbuf *,struct nfsreq *));
< int nfs_rephead __P((int,struct nfsrv_descript *,struct nfssvc_sock *,int,int,u_quad_t *,struct mbuf **,struct mbuf **,caddr_t *));
< int nfs_sndlock __P((int *,struct nfsreq *));
---
> int nfs_send __P((struct socket *, struct sockaddr *, struct mbuf *,
> struct nfsreq *));
> int nfs_rephead __P((int, struct nfsrv_descript *, struct nfssvc_sock *,
> int, int, u_quad_t *, struct mbuf **, struct mbuf **,
> caddr_t *));
> int nfs_sndlock __P((int *, struct nfsreq *));
574,593c577,606
< int nfs_disct __P((struct mbuf **,caddr_t *,int,int,caddr_t *));
< int nfs_vinvalbuf __P((struct vnode *,int,struct ucred *,struct proc *,int));
< int nfs_readrpc __P((struct vnode *,struct uio *,struct ucred *));
< int nfs_writerpc __P((struct vnode *,struct uio *,struct ucred *,int *,int *));
< int nfs_readdirrpc __P((register struct vnode *,struct uio *,struct ucred *));
< int nfs_asyncio __P((struct buf *,struct ucred *));
< int nfs_doio __P((struct buf *,struct ucred *,struct proc *));
< int nfs_readlinkrpc __P((struct vnode *,struct uio *,struct ucred *));
< int nfs_sigintr __P((struct nfsmount *,struct nfsreq *r,struct proc *));
< int nfs_readdirplusrpc __P((struct vnode *,register struct uio *,struct ucred *));
< int nfsm_disct __P((struct mbuf **,caddr_t *,int,int,caddr_t *));
< void nfsm_srvfattr __P((struct nfsrv_descript *,struct vattr *,struct nfs_fattr *));
< 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 **));
< int netaddr_match __P((int,union nethostaddr *,struct mbuf *));
< int nfs_request __P((struct vnode *,struct mbuf *,int,struct proc *,struct ucred *,struct mbuf **,struct mbuf **,caddr_t *));
< int nfs_loadattrcache __P((struct vnode **,struct mbuf **,caddr_t *,struct vattr *));
< int nfs_namei __P((struct nameidata *,fhandle_t *,int,struct nfssvc_sock *,struct mbuf *,struct mbuf **,caddr_t *,struct vnode **,struct proc *,int,int));
< void nfsm_adj __P((struct mbuf *,int,int));
< int nfsm_mbuftouio __P((struct mbuf **,struct uio *,int,caddr_t *));
---
> int nfs_disct __P((struct mbuf **, caddr_t *, int, int, caddr_t *));
> int nfs_vinvalbuf __P((struct vnode *, int, struct ucred *, struct proc *,
> int));
> int nfs_readrpc __P((struct vnode *, struct uio *, struct ucred *));
> int nfs_writerpc __P((struct vnode *, struct uio *, struct ucred *, int *,
> int *));
> int nfs_readdirrpc __P((struct vnode *, struct uio *, struct ucred *));
> int nfs_asyncio __P((struct buf *, struct ucred *));
> int nfs_doio __P((struct buf *, struct ucred *, struct proc *));
> int nfs_readlinkrpc __P((struct vnode *, struct uio *, struct ucred *));
> int nfs_sigintr __P((struct nfsmount *, struct nfsreq *, struct proc *));
> int nfs_readdirplusrpc __P((struct vnode *, struct uio *, struct ucred *));
> int nfsm_disct __P((struct mbuf **, caddr_t *, int, int, caddr_t *));
> void nfsm_srvfattr __P((struct nfsrv_descript *, struct vattr *,
> struct nfs_fattr *));
> 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 **));
> int netaddr_match __P((int, union nethostaddr *, struct sockaddr *));
> int nfs_request __P((struct vnode *, struct mbuf *, int, struct proc *,
> struct ucred *, struct mbuf **, struct mbuf **,
> caddr_t *));
> int nfs_loadattrcache __P((struct vnode **, struct mbuf **, caddr_t *,
> struct vattr *));
> int nfs_namei __P((struct nameidata *, fhandle_t *, int,
> struct nfssvc_sock *, struct sockaddr *, struct mbuf **,
> caddr_t *, struct vnode **, struct proc *, int, int));
> void nfsm_adj __P((struct mbuf *, int, int));
> int nfsm_mbuftouio __P((struct mbuf **, struct uio *, int, caddr_t *));
595,598c608,615
< 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 nfs_adv __P((struct mbuf **,caddr_t *,int,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 nfs_adv __P((struct mbuf **, caddr_t *, int, int));
601,604c618,623
< u_long nfs_hash __P((nfsfh_t *,int));
< int nfsrv_dorec __P((struct nfssvc_sock *,struct nfsd *,struct nfsrv_descript **));
< int nfsrv_getcache __P((struct nfsrv_descript *,struct nfssvc_sock *,struct mbuf **));
< void nfsrv_updatecache __P((struct nfsrv_descript *,int,struct mbuf *));
---
> u_long nfs_hash __P((nfsfh_t *, int));
> int nfsrv_dorec __P((struct nfssvc_sock *, struct nfsd *,
> struct nfsrv_descript **));
> int nfsrv_getcache __P((struct nfsrv_descript *, struct nfssvc_sock *,
> struct mbuf **));
> void nfsrv_updatecache __P((struct nfsrv_descript *, int, struct mbuf *));
606c625
< int nfs_connect __P((struct nfsmount *,struct nfsreq *));
---
> int nfs_connect __P((struct nfsmount *, struct nfsreq *));
608,611c627,631
< int nfs_getattrcache __P((struct vnode *,struct vattr *));
< int nfsm_strtmbuf __P((struct mbuf **,char **,char *,long));
< int nfs_bioread __P((struct vnode *,struct uio *,int,struct ucred *, int getpages));
< int nfsm_uiotombuf __P((struct uio *,struct mbuf **,int,caddr_t *));
---
> int nfs_getattrcache __P((struct vnode *, struct vattr *));
> int nfsm_strtmbuf __P((struct mbuf **, char **, char *, long));
> int nfs_bioread __P((struct vnode *, struct uio *, int, struct ucred *,
> int));
> int nfsm_uiotombuf __P((struct uio *, struct mbuf **, int, caddr_t *));
615,618c635,638
< void nfsrvw_sort __P((gid_t [],int));
< void nfsrv_setcred __P((struct ucred *,struct ucred *));
< int nfs_writebp __P((struct buf *,int));
< int nfsrv_object_create __P(( struct vnode * ));
---
> void nfsrvw_sort __P((gid_t *, int));
> void nfsrv_setcred __P((struct ucred *, struct ucred *));
> int nfs_writebp __P((struct buf *, int));
> int nfsrv_object_create __P((struct vnode *));
625c645,646
< int nfsrv3_access __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
---
> int nfsrv3_access __P((struct nfsrv_descript *nfsd,
> struct nfssvc_sock *slp,
631,633c652,654
< int nfsrv_fhtovp __P((fhandle_t *,int,struct vnode **,
< struct ucred *,struct nfssvc_sock *,struct mbuf *,
< int *,int,int));
---
> int nfsrv_fhtovp __P((fhandle_t *, int, struct vnode **, struct ucred *,
> struct nfssvc_sock *, struct sockaddr *, int *,
> int, int));
658c679,680
< int nfsrv_readdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
---
> int nfsrv_readdir __P((struct nfsrv_descript *nfsd,
> struct nfssvc_sock *slp,
672c694,695
< int nfsrv_setattr __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
---
> int nfsrv_setattr __P((struct nfsrv_descript *nfsd,
> struct nfssvc_sock *slp,
674c697,698
< int nfsrv_statfs __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
---
> int nfsrv_statfs __P((struct nfsrv_descript *nfsd,
> struct nfssvc_sock *slp,
676c700,701
< int nfsrv_symlink __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
---
> int nfsrv_symlink __P((struct nfsrv_descript *nfsd,
> struct nfssvc_sock *slp,
< * $Id: nfs.h,v 1.28 1997/06/03 17:22:45 dfr Exp $
---
> * $Id: nfs.h,v 1.29 1997/07/16 09:06:27 dfr Exp $
385c385
< struct mbuf *had_nam;
---
> struct sockaddr *had_nam;
409c409
< struct mbuf *nr_address;
---
> struct sockaddr *nr_address;
418c418
< struct mbuf *ns_nam;
---
> struct sockaddr *ns_nam;
483,484c483,484
< struct mbuf *nd_nam; /* and socket addr */
< struct mbuf *nd_nam2; /* return socket addr */
---
> struct sockaddr *nd_nam; /* and socket addr */
> struct sockaddr *nd_nam2; /* return socket addr */
570,572c570,575
< int nfs_send __P((struct socket *,struct mbuf *,struct mbuf *,struct nfsreq *));
< int nfs_rephead __P((int,struct nfsrv_descript *,struct nfssvc_sock *,int,int,u_quad_t *,struct mbuf **,struct mbuf **,caddr_t *));
< int nfs_sndlock __P((int *,struct nfsreq *));
---
> int nfs_send __P((struct socket *, struct sockaddr *, struct mbuf *,
> struct nfsreq *));
> int nfs_rephead __P((int, struct nfsrv_descript *, struct nfssvc_sock *,
> int, int, u_quad_t *, struct mbuf **, struct mbuf **,
> caddr_t *));
> int nfs_sndlock __P((int *, struct nfsreq *));
574,593c577,606
< int nfs_disct __P((struct mbuf **,caddr_t *,int,int,caddr_t *));
< int nfs_vinvalbuf __P((struct vnode *,int,struct ucred *,struct proc *,int));
< int nfs_readrpc __P((struct vnode *,struct uio *,struct ucred *));
< int nfs_writerpc __P((struct vnode *,struct uio *,struct ucred *,int *,int *));
< int nfs_readdirrpc __P((register struct vnode *,struct uio *,struct ucred *));
< int nfs_asyncio __P((struct buf *,struct ucred *));
< int nfs_doio __P((struct buf *,struct ucred *,struct proc *));
< int nfs_readlinkrpc __P((struct vnode *,struct uio *,struct ucred *));
< int nfs_sigintr __P((struct nfsmount *,struct nfsreq *r,struct proc *));
< int nfs_readdirplusrpc __P((struct vnode *,register struct uio *,struct ucred *));
< int nfsm_disct __P((struct mbuf **,caddr_t *,int,int,caddr_t *));
< void nfsm_srvfattr __P((struct nfsrv_descript *,struct vattr *,struct nfs_fattr *));
< 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 **));
< int netaddr_match __P((int,union nethostaddr *,struct mbuf *));
< int nfs_request __P((struct vnode *,struct mbuf *,int,struct proc *,struct ucred *,struct mbuf **,struct mbuf **,caddr_t *));
< int nfs_loadattrcache __P((struct vnode **,struct mbuf **,caddr_t *,struct vattr *));
< int nfs_namei __P((struct nameidata *,fhandle_t *,int,struct nfssvc_sock *,struct mbuf *,struct mbuf **,caddr_t *,struct vnode **,struct proc *,int,int));
< void nfsm_adj __P((struct mbuf *,int,int));
< int nfsm_mbuftouio __P((struct mbuf **,struct uio *,int,caddr_t *));
---
> int nfs_disct __P((struct mbuf **, caddr_t *, int, int, caddr_t *));
> int nfs_vinvalbuf __P((struct vnode *, int, struct ucred *, struct proc *,
> int));
> int nfs_readrpc __P((struct vnode *, struct uio *, struct ucred *));
> int nfs_writerpc __P((struct vnode *, struct uio *, struct ucred *, int *,
> int *));
> int nfs_readdirrpc __P((struct vnode *, struct uio *, struct ucred *));
> int nfs_asyncio __P((struct buf *, struct ucred *));
> int nfs_doio __P((struct buf *, struct ucred *, struct proc *));
> int nfs_readlinkrpc __P((struct vnode *, struct uio *, struct ucred *));
> int nfs_sigintr __P((struct nfsmount *, struct nfsreq *, struct proc *));
> int nfs_readdirplusrpc __P((struct vnode *, struct uio *, struct ucred *));
> int nfsm_disct __P((struct mbuf **, caddr_t *, int, int, caddr_t *));
> void nfsm_srvfattr __P((struct nfsrv_descript *, struct vattr *,
> struct nfs_fattr *));
> 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 **));
> int netaddr_match __P((int, union nethostaddr *, struct sockaddr *));
> int nfs_request __P((struct vnode *, struct mbuf *, int, struct proc *,
> struct ucred *, struct mbuf **, struct mbuf **,
> caddr_t *));
> int nfs_loadattrcache __P((struct vnode **, struct mbuf **, caddr_t *,
> struct vattr *));
> int nfs_namei __P((struct nameidata *, fhandle_t *, int,
> struct nfssvc_sock *, struct sockaddr *, struct mbuf **,
> caddr_t *, struct vnode **, struct proc *, int, int));
> void nfsm_adj __P((struct mbuf *, int, int));
> int nfsm_mbuftouio __P((struct mbuf **, struct uio *, int, caddr_t *));
595,598c608,615
< 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 nfs_adv __P((struct mbuf **,caddr_t *,int,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 nfs_adv __P((struct mbuf **, caddr_t *, int, int));
601,604c618,623
< u_long nfs_hash __P((nfsfh_t *,int));
< int nfsrv_dorec __P((struct nfssvc_sock *,struct nfsd *,struct nfsrv_descript **));
< int nfsrv_getcache __P((struct nfsrv_descript *,struct nfssvc_sock *,struct mbuf **));
< void nfsrv_updatecache __P((struct nfsrv_descript *,int,struct mbuf *));
---
> u_long nfs_hash __P((nfsfh_t *, int));
> int nfsrv_dorec __P((struct nfssvc_sock *, struct nfsd *,
> struct nfsrv_descript **));
> int nfsrv_getcache __P((struct nfsrv_descript *, struct nfssvc_sock *,
> struct mbuf **));
> void nfsrv_updatecache __P((struct nfsrv_descript *, int, struct mbuf *));
606c625
< int nfs_connect __P((struct nfsmount *,struct nfsreq *));
---
> int nfs_connect __P((struct nfsmount *, struct nfsreq *));
608,611c627,631
< int nfs_getattrcache __P((struct vnode *,struct vattr *));
< int nfsm_strtmbuf __P((struct mbuf **,char **,char *,long));
< int nfs_bioread __P((struct vnode *,struct uio *,int,struct ucred *, int getpages));
< int nfsm_uiotombuf __P((struct uio *,struct mbuf **,int,caddr_t *));
---
> int nfs_getattrcache __P((struct vnode *, struct vattr *));
> int nfsm_strtmbuf __P((struct mbuf **, char **, char *, long));
> int nfs_bioread __P((struct vnode *, struct uio *, int, struct ucred *,
> int));
> int nfsm_uiotombuf __P((struct uio *, struct mbuf **, int, caddr_t *));
615,618c635,638
< void nfsrvw_sort __P((gid_t [],int));
< void nfsrv_setcred __P((struct ucred *,struct ucred *));
< int nfs_writebp __P((struct buf *,int));
< int nfsrv_object_create __P(( struct vnode * ));
---
> void nfsrvw_sort __P((gid_t *, int));
> void nfsrv_setcred __P((struct ucred *, struct ucred *));
> int nfs_writebp __P((struct buf *, int));
> int nfsrv_object_create __P((struct vnode *));
625c645,646
< int nfsrv3_access __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
---
> int nfsrv3_access __P((struct nfsrv_descript *nfsd,
> struct nfssvc_sock *slp,
631,633c652,654
< int nfsrv_fhtovp __P((fhandle_t *,int,struct vnode **,
< struct ucred *,struct nfssvc_sock *,struct mbuf *,
< int *,int,int));
---
> int nfsrv_fhtovp __P((fhandle_t *, int, struct vnode **, struct ucred *,
> struct nfssvc_sock *, struct sockaddr *, int *,
> int, int));
658c679,680
< int nfsrv_readdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
---
> int nfsrv_readdir __P((struct nfsrv_descript *nfsd,
> struct nfssvc_sock *slp,
672c694,695
< int nfsrv_setattr __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
---
> int nfsrv_setattr __P((struct nfsrv_descript *nfsd,
> struct nfssvc_sock *slp,
674c697,698
< int nfsrv_statfs __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
---
> int nfsrv_statfs __P((struct nfsrv_descript *nfsd,
> struct nfssvc_sock *slp,
676c700,701
< int nfsrv_symlink __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
---
> int nfsrv_symlink __P((struct nfsrv_descript *nfsd,
> struct nfssvc_sock *slp,