Completed function declarations, added prototypes and removed redundant

declarations.

4 files changed, 129 insertions, 48 deletions

diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c
index e1c5366..6048727 100644
--- a/sys/nfs/nfs_nqlease.c
+++ b/sys/nfs/nfs_nqlease.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_nqlease.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_nqlease.c,v 1.15 1995/08/24 11:04:02 davidg Exp $
+ * $Id: nfs_nqlease.c,v 1.16 1995/10/29 15:32:55 phk Exp $
  */
 
 /*
@@ -79,10 +79,23 @@ int nqsrv_clockskew = NQ_CLOCKSKEW;
 int nqsrv_writeslack = NQ_WRITESLACK;
 int nqsrv_maxlease = NQ_MAXLEASE;
 int nqsrv_maxnumlease = NQ_MAXNUMLEASE;
-void nqsrv_instimeq(), nqsrv_send_eviction(), nfs_sndunlock();
-void nqsrv_unlocklease(), nqsrv_waitfor_expiry(), nfsrv_slpderef();
-void nqsrv_addhost(), nqsrv_locklease(), nqnfs_serverd();
-void nqnfs_clientlease();
+
+struct vop_lease_args;
+
+extern void	nqnfs_lease_check __P((struct vnode *vp, struct proc *p,
+				       struct ucred *cred, int flag));
+extern void	nqnfs_lease_updatetime __P((int deltat));
+extern int	nqnfs_vacated __P((struct vnode *vp, struct ucred *cred));
+extern int	nqnfs_vop_lease_check __P((struct vop_lease_args *ap));
+extern void	nqsrv_addhost __P((struct nqhost *lph, struct nfssvc_sock *slp,
+				   struct mbuf *nam));
+extern void	nqsrv_instimeq __P((struct nqlease *lp, u_long duration));
+extern void	nqsrv_locklease __P((struct nqlease *lp));
+extern void	nqsrv_send_eviction __P((struct vnode *vp, struct nqlease *lp,
+					 struct nfssvc_sock *slp,
+					 struct mbuf *nam, struct ucred *cred));
+extern void	nqsrv_unlocklease __P((struct nqlease *lp));
+extern void	nqsrv_waitfor_expiry __P((struct nqlease *lp));
 
 /*
  * Signifies which rpcs can have piggybacked lease requests
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c
index 427f304..3f476b2 100644
--- a/sys/nfs/nfs_socket.c
+++ b/sys/nfs/nfs_socket.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_socket.c	8.3 (Berkeley) 1/12/94
- * $Id: nfs_socket.c,v 1.9 1995/08/24 11:04:04 davidg Exp $
+ * $Id: nfs_socket.c,v 1.10 1995/10/29 15:33:04 phk Exp $
  */
 
 /*
@@ -131,39 +131,90 @@ static int proct[NFS_NPROCS] = {
 #define	NFS_CWNDSCALE	256
 #define	NFS_MAXCWND	(NFS_CWNDSCALE * 32)
 static int nfs_backoff[8] = { 2, 4, 8, 16, 32, 64, 128, 256, };
-int	nfs_sbwait();
-void	nfs_disconnect(), nfs_realign(), nfsrv_wakenfsd(), nfs_sndunlock();
-void	nfs_rcvunlock(), nqnfs_serverd(), nqnfs_clientlease();
 int nfsrtton = 0;
 struct nfsrtt nfsrtt;
 
-int	nfsrv_null(),
-	nfsrv_getattr(),
-	nfsrv_setattr(),
-	nfsrv_lookup(),
-	nfsrv3_access(),
-	nfsrv_readlink(),
-	nfsrv_read(),
-	nfsrv_write(),
-	nfsrv_create(),
-	nfsrv_mknod(),
-	nfsrv_remove(),
-	nfsrv_rename(),
-	nfsrv_link(),
-	nfsrv_symlink(),
-	nfsrv_mkdir(),
-	nfsrv_rmdir(),
-	nfsrv_readdir(),
-	nfsrv_readdirplus(),
-	nfsrv_statfs(),
-	nfsrv_fsinfo(),
-	nfsrv_pathconf(),
-	nfsrv_commit(),
-	nfsrv_noop(),
-	nqnfsrv_getlease(),
-	nqnfsrv_vacated();
-
-int (*nfsrv3_procs[NFS_NPROCS])() = {
+extern void	nfs_disconnect __P((struct nfsmount *nmp));
+extern void	nfs_realign __P((struct mbuf *m, int hsiz));
+extern int	nfs_receive __P((struct nfsreq *rep, struct mbuf **aname,
+				 struct mbuf **mp));
+extern int	nfs_reconnect __P((struct nfsreq *rep));
+extern int	nfsrv3_access __P((struct nfsrv_descript *nfsd,
+				   struct nfssvc_sock *slp, struct proc *procp,
+				   struct mbuf **mrq));
+extern int	nfsrv_commit __P((struct nfsrv_descript *nfsd,
+				  struct nfssvc_sock *slp, struct proc *procp,
+				  struct mbuf **mrq));
+extern int	nfsrv_create __P((struct nfsrv_descript *nfsd,
+				  struct nfssvc_sock *slp, struct proc *procp,
+				  struct mbuf **mrq));
+extern int	nfsrv_fsinfo __P((struct nfsrv_descript *nfsd,
+				  struct nfssvc_sock *slp, struct proc *procp,
+				  struct mbuf **mrq));
+extern int	nfsrv_getattr __P((struct nfsrv_descript *nfsd,
+				   struct nfssvc_sock *slp, struct proc *procp,
+				   struct mbuf **mrq));
+extern int	nfsrv_link __P((struct nfsrv_descript *nfsd,
+				struct nfssvc_sock *slp, struct proc *procp,
+				struct mbuf **mrq));
+extern int	nfsrv_lookup __P((struct nfsrv_descript *nfsd,
+				  struct nfssvc_sock *slp, struct proc *procp,
+				  struct mbuf **mrq));
+extern int	nfsrv_mkdir __P((struct nfsrv_descript *nfsd,
+				 struct nfssvc_sock *slp, struct proc *procp,
+				 struct mbuf **mrq));
+extern int	nfsrv_mknod __P((struct nfsrv_descript *nfsd,
+				 struct nfssvc_sock *slp, struct proc *procp,
+				 struct mbuf **mrq));
+extern int	nfsrv_noop __P((struct nfsrv_descript *nfsd,
+				struct nfssvc_sock *slp, struct proc *procp,
+				struct mbuf **mrq));
+extern int	nfsrv_null __P((struct nfsrv_descript *nfsd,
+				struct nfssvc_sock *slp, struct proc *procp,
+				struct mbuf **mrq));
+extern int	nfsrv_pathconf __P((struct nfsrv_descript *nfsd,
+				    struct nfssvc_sock *slp, struct proc *procp,
+				    struct mbuf **mrq));
+extern void	nfsrv_rcv __P((struct socket *so, caddr_t arg, int waitflag));
+extern int	nfsrv_read __P((struct nfsrv_descript *nfsd,
+				struct nfssvc_sock *slp, struct proc *procp,
+				struct mbuf **mrq));
+extern int	nfsrv_readdir __P((struct nfsrv_descript *nfsd,
+				   struct nfssvc_sock *slp, struct proc *procp,
+				   struct mbuf **mrq));
+extern int	nfsrv_readdirplus __P((struct nfsrv_descript *nfsd,
+				       struct nfssvc_sock *slp,
+				       struct proc *procp, struct mbuf **mrq));
+extern int	nfsrv_readlink __P((struct nfsrv_descript *nfsd,
+				    struct nfssvc_sock *slp, struct proc *procp,
+				    struct mbuf **mrq));
+extern int	nfsrv_remove __P((struct nfsrv_descript *nfsd,
+				  struct nfssvc_sock *slp, struct proc *procp,
+				  struct mbuf **mrq));
+extern int	nfsrv_rename __P((struct nfsrv_descript *nfsd,
+				  struct nfssvc_sock *slp, struct proc *procp,
+				  struct mbuf **mrq));
+extern int	nfsrv_rmdir __P((struct nfsrv_descript *nfsd,
+				 struct nfssvc_sock *slp, struct proc *procp,
+				 struct mbuf **mrq));
+extern int	nfsrv_setattr __P((struct nfsrv_descript *nfsd,
+				   struct nfssvc_sock *slp, struct proc *procp,
+				   struct mbuf **mrq));
+extern int	nfsrv_statfs __P((struct nfsrv_descript *nfsd,
+				  struct nfssvc_sock *slp, struct proc *procp,
+				  struct mbuf **mrq));
+extern int	nfsrv_symlink __P((struct nfsrv_descript *nfsd,
+				   struct nfssvc_sock *slp, struct proc *procp,
+				   struct mbuf **mrq));
+extern void	nfsrv_wakenfsd __P((struct nfssvc_sock *slp));
+extern int	nfsrv_write __P((struct nfsrv_descript *nfsd,
+				 struct nfssvc_sock *slp, struct proc *procp,
+				 struct mbuf **mrq));
+
+int (*nfsrv3_procs[NFS_NPROCS]) __P((struct nfsrv_descript *nd,
+				    struct nfssvc_sock *slp,
+				    struct proc *procp,
+				    struct mbuf **mreqp)) = {
 	nfsrv_null,
 	nfsrv_getattr,
 	nfsrv_setattr,
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index 35590c3..a8ecde9 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_syscalls.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_syscalls.c,v 1.8 1995/10/29 15:33:11 phk Exp $
+ * $Id: nfs_syscalls.c,v 1.9 1995/11/14 05:16:37 bde Exp $
  */
 
 #include <sys/param.h>
@@ -73,10 +73,11 @@
 #include <nfs/nqnfs.h>
 #include <nfs/nfsrtt.h>
 
-void	nfsrv_zapsock	__P((struct nfssvc_sock *));
-
 /* Global defs. */
-extern int (*nfsrv3_procs[NFS_NPROCS])();
+extern int (*nfsrv3_procs[NFS_NPROCS]) __P((struct nfsrv_descript *nd,
+					    struct nfssvc_sock *slp,
+					    struct proc *procp,
+					    struct mbuf **mreqp));
 extern struct proc *nfs_iodwant[NFS_MAXASYNCDAEMON];
 extern int nfs_numasync;
 extern time_t nqnfsstarttime;
@@ -91,14 +92,20 @@ int nfsd_waiting = 0;
 static int notstarted = 1;
 static int modify_flag = 0;
 static struct nfsdrt nfsdrt;
-void nfsrv_cleancache(), nfsrv_rcv(), nfsrv_wakenfsd(), nfs_sndunlock();
-static void nfsd_rt();
-void nfsrv_slpderef();
+
+extern void	nfsrv_cleancache __P((void));
+extern void	nfsrv_rcv __P((struct socket *so, caddr_t arg, int waitflag));
+extern void	nfsrv_wakenfsd __P((struct nfssvc_sock *slp));
+extern void	nfsrv_zapsock __P((struct nfssvc_sock *slp));
 
 #define	TRUE	1
 #define	FALSE	0
 
 static int nfs_asyncdaemon[NFS_MAXASYNCDAEMON];
+
+static void	nfsd_rt __P((int sotype, struct nfsrv_descript *nd,
+			     int cacherep));
+
 /*
  * NFS server system calls
  * getfh() lives here too, but maybe should move to kern/vfs_syscalls.c
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index ec818c9..88827b1 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.5 (Berkeley) 2/13/94
- * $Id: nfs_vnops.c,v 1.28 1995/11/06 00:36:01 bde Exp $
+ * $Id: nfs_vnops.c,v 1.29 1995/11/09 08:17:02 bde Exp $
  */
 
 /*
@@ -313,10 +313,20 @@ static struct vnodeopv_desc fifo_nfsv2nodeop_opv_desc =
 VNODEOP_SET(fifo_nfsv2nodeop_opv_desc);
 #endif
 
-void nqnfs_clientlease();
-static int nfs_commit();
-static int nfs_removerpc();
-static int nfs_renamerpc();
+static int	nfs_commit __P((struct vnode *vp, u_quad_t offset, int cnt,
+				struct ucred *cred, struct proc *procp));
+static int	nfs_mknodrpc __P((struct vnode *dvp, struct vnode **vpp,
+				  struct componentname *cnp,
+				  struct vattr *vap));
+static int	nfs_removerpc __P((struct vnode *dvp, char *name, int namelen,
+				   struct ucred *cred, struct proc *proc));
+static int	nfs_renamerpc __P((struct vnode *fdvp, char *fnameptr,
+				   int fnamelen, struct vnode *tdvp,
+				   char *tnameptr, int tnamelen,
+				   struct ucred *cred, struct proc *proc));
+static int	nfs_renameit __P((struct vnode *sdvp,
+				  struct componentname *scnp,
+				  struct sillyrename *sp));
 
 /*
  * Global variables