summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1995-12-03 10:03:12 +0000
committerbde <bde@FreeBSD.org>1995-12-03 10:03:12 +0000
commit0424444c05f1d3d6ab6d8956e8a4f89b32353e6c (patch)
tree5d156c61c326ad43996a98082e1e1f2a41ee1a3e /sys
parenta4a14ffe8e6e34a437c99e199dc36c4806a9c93f (diff)
downloadFreeBSD-src-0424444c05f1d3d6ab6d8956e8a4f89b32353e6c.zip
FreeBSD-src-0424444c05f1d3d6ab6d8956e8a4f89b32353e6c.tar.gz
Completed function declarations and/or added prototypes and/or moved
prototypes to the right place.
Diffstat (limited to 'sys')
-rw-r--r--sys/nfs/nfs.h56
-rw-r--r--sys/nfs/nfs_bio.c6
-rw-r--r--sys/nfs/nfs_socket.c74
-rw-r--r--sys/nfs/nfs_syscalls.c5
-rw-r--r--sys/nfs/nfs_vfsops.c16
-rw-r--r--sys/nfsclient/nfs.h56
-rw-r--r--sys/nfsclient/nfs_bio.c6
-rw-r--r--sys/nfsclient/nfs_nfsiod.c5
-rw-r--r--sys/nfsclient/nfs_socket.c74
-rw-r--r--sys/nfsclient/nfs_vfsops.c16
-rw-r--r--sys/nfsclient/nfsargs.h56
-rw-r--r--sys/nfsclient/nfsstats.h56
-rw-r--r--sys/nfsserver/nfs.h56
-rw-r--r--sys/nfsserver/nfs_srvsock.c74
-rw-r--r--sys/nfsserver/nfs_syscalls.c5
-rw-r--r--sys/nfsserver/nfsrvstats.h56
16 files changed, 364 insertions, 253 deletions
diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h
index 3e31610..58b1e97 100644
--- a/sys/nfs/nfs.h
+++ b/sys/nfs/nfs.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs.h 8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.13 1995/10/31 21:17:59 joerg Exp $
+ * $Id: nfs.h,v 1.14 1995/11/21 12:54:38 bde Exp $
*/
#ifndef _NFS_NFS_H_
@@ -527,10 +527,12 @@ int nfssvc_nfsd __P((struct nfsd_srvargs *,caddr_t,struct proc *));
int nfssvc_addsock __P((struct file *,struct mbuf *));
void nfsrv_slpderef __P((struct nfssvc_sock *slp));
int nfsrv_dorec __P((struct nfssvc_sock *,struct nfsd *,struct nfsrv_descript **));
+void nfsrv_cleancache __P((void));
int nfsrv_getcache __P((struct nfsrv_descript *,struct nfssvc_sock *,struct mbuf **));
void nfsrv_updatecache __P((struct nfsrv_descript *,int,struct mbuf *));
int mountnfs __P((struct nfs_args *,struct mount *,struct mbuf *,char *,char *,struct vnode **));
int nfs_connect __P((struct nfsmount *,struct nfsreq *));
+void nfs_disconnect __P((struct nfsmount *nmp));
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 *));
@@ -539,17 +541,69 @@ void nfsrv_init __P((int));
void nfs_clearcommit __P((struct mount *));
int nfsrv_errmap __P((struct nfsrv_descript *, int));
void nfsrvw_coalesce __P((struct nfsrv_descript *,struct nfsrv_descript *));
+void nfsrv_rcv __P((struct socket *so, caddr_t arg, int waitflag));
void nfsrvw_sort __P((gid_t [],int));
void nfsrv_setcred __P((struct ucred *,struct ucred *));
int nfs_writebp __P((struct buf *,int));
int nfsrv_vput __P(( struct vnode * ));
int nfsrv_vrele __P(( struct vnode * ));
int nfsrv_vmio __P(( struct vnode * ));
+void nfsrv_wakenfsd __P((struct nfssvc_sock *slp));
int nfsrv_writegather __P((struct nfsrv_descript **, struct nfssvc_sock *,
struct proc *, struct mbuf **));
int nfs_fsinfo __P((struct nfsmount *, struct vnode *, struct ucred *,
struct proc *p));
+int nfsrv3_access __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_commit __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_create __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_fsinfo __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_getattr __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_link __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_lookup __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_mkdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_mknod __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_noop __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_null __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_pathconf __P((struct nfsrv_descript *nfsd,
+ struct nfssvc_sock *slp, struct proc *procp,
+ struct mbuf **mrq));
+int nfsrv_read __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_readdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_readdirplus __P((struct nfsrv_descript *nfsd,
+ struct nfssvc_sock *slp, struct proc *procp,
+ struct mbuf **mrq));
+int nfsrv_readlink __P((struct nfsrv_descript *nfsd,
+ struct nfssvc_sock *slp, struct proc *procp,
+ struct mbuf **mrq));
+int nfsrv_remove __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_rename __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_rmdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_setattr __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_statfs __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_symlink __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_write __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+
#endif /* KERNEL */
#endif
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c
index e1dbc246..a32ca73 100644
--- a/sys/nfs/nfs_bio.c
+++ b/sys/nfs/nfs_bio.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_bio.c 8.5 (Berkeley) 1/4/94
- * $Id: nfs_bio.c,v 1.17 1995/08/24 10:17:32 dfr Exp $
+ * $Id: nfs_bio.c,v 1.18 1995/10/29 15:32:46 phk Exp $
*/
#include <sys/param.h>
@@ -56,7 +56,9 @@
#include <nfs/nqnfs.h>
#include <nfs/nfsnode.h>
-struct buf *nfs_getcacheblk();
+extern struct buf *nfs_getcacheblk __P((struct vnode *vp, daddr_t bn, int size,
+ struct proc *p));
+
extern struct proc *nfs_iodwant[NFS_MAXASYNCDAEMON];
extern int nfs_numasync;
extern struct nfsstats nfsstats;
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c
index 3f476b2..f497afe 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.10 1995/10/29 15:33:04 phk Exp $
+ * $Id: nfs_socket.c,v 1.11 1995/11/21 15:51:32 bde Exp $
*/
/*
@@ -134,82 +134,10 @@ static int nfs_backoff[8] = { 2, 4, 8, 16, 32, 64, 128, 256, };
int nfsrtton = 0;
struct nfsrtt nfsrtt;
-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,
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index a8ecde9..44789f7 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.9 1995/11/14 05:16:37 bde Exp $
+ * $Id: nfs_syscalls.c,v 1.10 1995/11/21 15:51:34 bde Exp $
*/
#include <sys/param.h>
@@ -93,9 +93,6 @@ static int notstarted = 1;
static int modify_flag = 0;
static struct nfsdrt nfsdrt;
-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
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c
index f6f3dd6..9876c2d 100644
--- a/sys/nfs/nfs_vfsops.c
+++ b/sys/nfs/nfs_vfsops.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_vfsops.c 8.3 (Berkeley) 1/4/94
- * $Id: nfs_vfsops.c,v 1.20 1995/08/30 17:24:15 dfr Exp $
+ * $Id: nfs_vfsops.c,v 1.21 1995/11/14 09:37:19 phk Exp $
*/
#include <sys/param.h>
@@ -68,10 +68,15 @@
#include <nfs/nfsdiskless.h>
#include <nfs/nqnfs.h>
-struct nfsstats nfsstats;
-static int nfs_sysctl(int *, u_int, void *, size_t *, void *, size_t,
- struct proc *);
-extern int nfs_ticks;
+extern int nfs_mountroot __P((void));
+
+extern int nfs_ticks;
+
+struct nfsstats nfsstats;
+
+static int nfs_iosize __P((struct nfsmount *nmp));
+static int nfs_sysctl(int *, u_int, void *, size_t *, void *, size_t,
+ struct proc *);
/*
* nfs vfs operations.
@@ -107,7 +112,6 @@ VFS_SET(nfs_vfsops, nfs, MOUNT_NFS, VFCF_NETWORK);
struct nfs_diskless nfs_diskless = { 0 };
int nfs_diskless_valid = 0;
-void nfs_disconnect __P((struct nfsmount *));
void nfsargs_ntoh __P((struct nfs_args *));
static struct mount *nfs_mountdiskless __P((char *, char *, int,
struct sockaddr_in *, struct nfs_args *, register struct vnode **));
diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h
index 3e31610..58b1e97 100644
--- a/sys/nfsclient/nfs.h
+++ b/sys/nfsclient/nfs.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs.h 8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.13 1995/10/31 21:17:59 joerg Exp $
+ * $Id: nfs.h,v 1.14 1995/11/21 12:54:38 bde Exp $
*/
#ifndef _NFS_NFS_H_
@@ -527,10 +527,12 @@ int nfssvc_nfsd __P((struct nfsd_srvargs *,caddr_t,struct proc *));
int nfssvc_addsock __P((struct file *,struct mbuf *));
void nfsrv_slpderef __P((struct nfssvc_sock *slp));
int nfsrv_dorec __P((struct nfssvc_sock *,struct nfsd *,struct nfsrv_descript **));
+void nfsrv_cleancache __P((void));
int nfsrv_getcache __P((struct nfsrv_descript *,struct nfssvc_sock *,struct mbuf **));
void nfsrv_updatecache __P((struct nfsrv_descript *,int,struct mbuf *));
int mountnfs __P((struct nfs_args *,struct mount *,struct mbuf *,char *,char *,struct vnode **));
int nfs_connect __P((struct nfsmount *,struct nfsreq *));
+void nfs_disconnect __P((struct nfsmount *nmp));
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 *));
@@ -539,17 +541,69 @@ void nfsrv_init __P((int));
void nfs_clearcommit __P((struct mount *));
int nfsrv_errmap __P((struct nfsrv_descript *, int));
void nfsrvw_coalesce __P((struct nfsrv_descript *,struct nfsrv_descript *));
+void nfsrv_rcv __P((struct socket *so, caddr_t arg, int waitflag));
void nfsrvw_sort __P((gid_t [],int));
void nfsrv_setcred __P((struct ucred *,struct ucred *));
int nfs_writebp __P((struct buf *,int));
int nfsrv_vput __P(( struct vnode * ));
int nfsrv_vrele __P(( struct vnode * ));
int nfsrv_vmio __P(( struct vnode * ));
+void nfsrv_wakenfsd __P((struct nfssvc_sock *slp));
int nfsrv_writegather __P((struct nfsrv_descript **, struct nfssvc_sock *,
struct proc *, struct mbuf **));
int nfs_fsinfo __P((struct nfsmount *, struct vnode *, struct ucred *,
struct proc *p));
+int nfsrv3_access __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_commit __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_create __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_fsinfo __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_getattr __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_link __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_lookup __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_mkdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_mknod __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_noop __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_null __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_pathconf __P((struct nfsrv_descript *nfsd,
+ struct nfssvc_sock *slp, struct proc *procp,
+ struct mbuf **mrq));
+int nfsrv_read __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_readdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_readdirplus __P((struct nfsrv_descript *nfsd,
+ struct nfssvc_sock *slp, struct proc *procp,
+ struct mbuf **mrq));
+int nfsrv_readlink __P((struct nfsrv_descript *nfsd,
+ struct nfssvc_sock *slp, struct proc *procp,
+ struct mbuf **mrq));
+int nfsrv_remove __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_rename __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_rmdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_setattr __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_statfs __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_symlink __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_write __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+
#endif /* KERNEL */
#endif
diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c
index e1dbc246..a32ca73 100644
--- a/sys/nfsclient/nfs_bio.c
+++ b/sys/nfsclient/nfs_bio.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_bio.c 8.5 (Berkeley) 1/4/94
- * $Id: nfs_bio.c,v 1.17 1995/08/24 10:17:32 dfr Exp $
+ * $Id: nfs_bio.c,v 1.18 1995/10/29 15:32:46 phk Exp $
*/
#include <sys/param.h>
@@ -56,7 +56,9 @@
#include <nfs/nqnfs.h>
#include <nfs/nfsnode.h>
-struct buf *nfs_getcacheblk();
+extern struct buf *nfs_getcacheblk __P((struct vnode *vp, daddr_t bn, int size,
+ struct proc *p));
+
extern struct proc *nfs_iodwant[NFS_MAXASYNCDAEMON];
extern int nfs_numasync;
extern struct nfsstats nfsstats;
diff --git a/sys/nfsclient/nfs_nfsiod.c b/sys/nfsclient/nfs_nfsiod.c
index a8ecde9..44789f7 100644
--- a/sys/nfsclient/nfs_nfsiod.c
+++ b/sys/nfsclient/nfs_nfsiod.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_syscalls.c 8.3 (Berkeley) 1/4/94
- * $Id: nfs_syscalls.c,v 1.9 1995/11/14 05:16:37 bde Exp $
+ * $Id: nfs_syscalls.c,v 1.10 1995/11/21 15:51:34 bde Exp $
*/
#include <sys/param.h>
@@ -93,9 +93,6 @@ static int notstarted = 1;
static int modify_flag = 0;
static struct nfsdrt nfsdrt;
-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
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c
index 3f476b2..f497afe 100644
--- a/sys/nfsclient/nfs_socket.c
+++ b/sys/nfsclient/nfs_socket.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_socket.c 8.3 (Berkeley) 1/12/94
- * $Id: nfs_socket.c,v 1.10 1995/10/29 15:33:04 phk Exp $
+ * $Id: nfs_socket.c,v 1.11 1995/11/21 15:51:32 bde Exp $
*/
/*
@@ -134,82 +134,10 @@ static int nfs_backoff[8] = { 2, 4, 8, 16, 32, 64, 128, 256, };
int nfsrtton = 0;
struct nfsrtt nfsrtt;
-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,
diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c
index f6f3dd6..9876c2d 100644
--- a/sys/nfsclient/nfs_vfsops.c
+++ b/sys/nfsclient/nfs_vfsops.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_vfsops.c 8.3 (Berkeley) 1/4/94
- * $Id: nfs_vfsops.c,v 1.20 1995/08/30 17:24:15 dfr Exp $
+ * $Id: nfs_vfsops.c,v 1.21 1995/11/14 09:37:19 phk Exp $
*/
#include <sys/param.h>
@@ -68,10 +68,15 @@
#include <nfs/nfsdiskless.h>
#include <nfs/nqnfs.h>
-struct nfsstats nfsstats;
-static int nfs_sysctl(int *, u_int, void *, size_t *, void *, size_t,
- struct proc *);
-extern int nfs_ticks;
+extern int nfs_mountroot __P((void));
+
+extern int nfs_ticks;
+
+struct nfsstats nfsstats;
+
+static int nfs_iosize __P((struct nfsmount *nmp));
+static int nfs_sysctl(int *, u_int, void *, size_t *, void *, size_t,
+ struct proc *);
/*
* nfs vfs operations.
@@ -107,7 +112,6 @@ VFS_SET(nfs_vfsops, nfs, MOUNT_NFS, VFCF_NETWORK);
struct nfs_diskless nfs_diskless = { 0 };
int nfs_diskless_valid = 0;
-void nfs_disconnect __P((struct nfsmount *));
void nfsargs_ntoh __P((struct nfs_args *));
static struct mount *nfs_mountdiskless __P((char *, char *, int,
struct sockaddr_in *, struct nfs_args *, register struct vnode **));
diff --git a/sys/nfsclient/nfsargs.h b/sys/nfsclient/nfsargs.h
index 3e31610..58b1e97 100644
--- a/sys/nfsclient/nfsargs.h
+++ b/sys/nfsclient/nfsargs.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs.h 8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.13 1995/10/31 21:17:59 joerg Exp $
+ * $Id: nfs.h,v 1.14 1995/11/21 12:54:38 bde Exp $
*/
#ifndef _NFS_NFS_H_
@@ -527,10 +527,12 @@ int nfssvc_nfsd __P((struct nfsd_srvargs *,caddr_t,struct proc *));
int nfssvc_addsock __P((struct file *,struct mbuf *));
void nfsrv_slpderef __P((struct nfssvc_sock *slp));
int nfsrv_dorec __P((struct nfssvc_sock *,struct nfsd *,struct nfsrv_descript **));
+void nfsrv_cleancache __P((void));
int nfsrv_getcache __P((struct nfsrv_descript *,struct nfssvc_sock *,struct mbuf **));
void nfsrv_updatecache __P((struct nfsrv_descript *,int,struct mbuf *));
int mountnfs __P((struct nfs_args *,struct mount *,struct mbuf *,char *,char *,struct vnode **));
int nfs_connect __P((struct nfsmount *,struct nfsreq *));
+void nfs_disconnect __P((struct nfsmount *nmp));
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 *));
@@ -539,17 +541,69 @@ void nfsrv_init __P((int));
void nfs_clearcommit __P((struct mount *));
int nfsrv_errmap __P((struct nfsrv_descript *, int));
void nfsrvw_coalesce __P((struct nfsrv_descript *,struct nfsrv_descript *));
+void nfsrv_rcv __P((struct socket *so, caddr_t arg, int waitflag));
void nfsrvw_sort __P((gid_t [],int));
void nfsrv_setcred __P((struct ucred *,struct ucred *));
int nfs_writebp __P((struct buf *,int));
int nfsrv_vput __P(( struct vnode * ));
int nfsrv_vrele __P(( struct vnode * ));
int nfsrv_vmio __P(( struct vnode * ));
+void nfsrv_wakenfsd __P((struct nfssvc_sock *slp));
int nfsrv_writegather __P((struct nfsrv_descript **, struct nfssvc_sock *,
struct proc *, struct mbuf **));
int nfs_fsinfo __P((struct nfsmount *, struct vnode *, struct ucred *,
struct proc *p));
+int nfsrv3_access __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_commit __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_create __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_fsinfo __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_getattr __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_link __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_lookup __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_mkdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_mknod __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_noop __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_null __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_pathconf __P((struct nfsrv_descript *nfsd,
+ struct nfssvc_sock *slp, struct proc *procp,
+ struct mbuf **mrq));
+int nfsrv_read __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_readdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_readdirplus __P((struct nfsrv_descript *nfsd,
+ struct nfssvc_sock *slp, struct proc *procp,
+ struct mbuf **mrq));
+int nfsrv_readlink __P((struct nfsrv_descript *nfsd,
+ struct nfssvc_sock *slp, struct proc *procp,
+ struct mbuf **mrq));
+int nfsrv_remove __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_rename __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_rmdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_setattr __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_statfs __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_symlink __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_write __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+
#endif /* KERNEL */
#endif
diff --git a/sys/nfsclient/nfsstats.h b/sys/nfsclient/nfsstats.h
index 3e31610..58b1e97 100644
--- a/sys/nfsclient/nfsstats.h
+++ b/sys/nfsclient/nfsstats.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs.h 8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.13 1995/10/31 21:17:59 joerg Exp $
+ * $Id: nfs.h,v 1.14 1995/11/21 12:54:38 bde Exp $
*/
#ifndef _NFS_NFS_H_
@@ -527,10 +527,12 @@ int nfssvc_nfsd __P((struct nfsd_srvargs *,caddr_t,struct proc *));
int nfssvc_addsock __P((struct file *,struct mbuf *));
void nfsrv_slpderef __P((struct nfssvc_sock *slp));
int nfsrv_dorec __P((struct nfssvc_sock *,struct nfsd *,struct nfsrv_descript **));
+void nfsrv_cleancache __P((void));
int nfsrv_getcache __P((struct nfsrv_descript *,struct nfssvc_sock *,struct mbuf **));
void nfsrv_updatecache __P((struct nfsrv_descript *,int,struct mbuf *));
int mountnfs __P((struct nfs_args *,struct mount *,struct mbuf *,char *,char *,struct vnode **));
int nfs_connect __P((struct nfsmount *,struct nfsreq *));
+void nfs_disconnect __P((struct nfsmount *nmp));
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 *));
@@ -539,17 +541,69 @@ void nfsrv_init __P((int));
void nfs_clearcommit __P((struct mount *));
int nfsrv_errmap __P((struct nfsrv_descript *, int));
void nfsrvw_coalesce __P((struct nfsrv_descript *,struct nfsrv_descript *));
+void nfsrv_rcv __P((struct socket *so, caddr_t arg, int waitflag));
void nfsrvw_sort __P((gid_t [],int));
void nfsrv_setcred __P((struct ucred *,struct ucred *));
int nfs_writebp __P((struct buf *,int));
int nfsrv_vput __P(( struct vnode * ));
int nfsrv_vrele __P(( struct vnode * ));
int nfsrv_vmio __P(( struct vnode * ));
+void nfsrv_wakenfsd __P((struct nfssvc_sock *slp));
int nfsrv_writegather __P((struct nfsrv_descript **, struct nfssvc_sock *,
struct proc *, struct mbuf **));
int nfs_fsinfo __P((struct nfsmount *, struct vnode *, struct ucred *,
struct proc *p));
+int nfsrv3_access __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_commit __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_create __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_fsinfo __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_getattr __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_link __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_lookup __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_mkdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_mknod __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_noop __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_null __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_pathconf __P((struct nfsrv_descript *nfsd,
+ struct nfssvc_sock *slp, struct proc *procp,
+ struct mbuf **mrq));
+int nfsrv_read __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_readdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_readdirplus __P((struct nfsrv_descript *nfsd,
+ struct nfssvc_sock *slp, struct proc *procp,
+ struct mbuf **mrq));
+int nfsrv_readlink __P((struct nfsrv_descript *nfsd,
+ struct nfssvc_sock *slp, struct proc *procp,
+ struct mbuf **mrq));
+int nfsrv_remove __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_rename __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_rmdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_setattr __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_statfs __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_symlink __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_write __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+
#endif /* KERNEL */
#endif
diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h
index 3e31610..58b1e97 100644
--- a/sys/nfsserver/nfs.h
+++ b/sys/nfsserver/nfs.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs.h 8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.13 1995/10/31 21:17:59 joerg Exp $
+ * $Id: nfs.h,v 1.14 1995/11/21 12:54:38 bde Exp $
*/
#ifndef _NFS_NFS_H_
@@ -527,10 +527,12 @@ int nfssvc_nfsd __P((struct nfsd_srvargs *,caddr_t,struct proc *));
int nfssvc_addsock __P((struct file *,struct mbuf *));
void nfsrv_slpderef __P((struct nfssvc_sock *slp));
int nfsrv_dorec __P((struct nfssvc_sock *,struct nfsd *,struct nfsrv_descript **));
+void nfsrv_cleancache __P((void));
int nfsrv_getcache __P((struct nfsrv_descript *,struct nfssvc_sock *,struct mbuf **));
void nfsrv_updatecache __P((struct nfsrv_descript *,int,struct mbuf *));
int mountnfs __P((struct nfs_args *,struct mount *,struct mbuf *,char *,char *,struct vnode **));
int nfs_connect __P((struct nfsmount *,struct nfsreq *));
+void nfs_disconnect __P((struct nfsmount *nmp));
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 *));
@@ -539,17 +541,69 @@ void nfsrv_init __P((int));
void nfs_clearcommit __P((struct mount *));
int nfsrv_errmap __P((struct nfsrv_descript *, int));
void nfsrvw_coalesce __P((struct nfsrv_descript *,struct nfsrv_descript *));
+void nfsrv_rcv __P((struct socket *so, caddr_t arg, int waitflag));
void nfsrvw_sort __P((gid_t [],int));
void nfsrv_setcred __P((struct ucred *,struct ucred *));
int nfs_writebp __P((struct buf *,int));
int nfsrv_vput __P(( struct vnode * ));
int nfsrv_vrele __P(( struct vnode * ));
int nfsrv_vmio __P(( struct vnode * ));
+void nfsrv_wakenfsd __P((struct nfssvc_sock *slp));
int nfsrv_writegather __P((struct nfsrv_descript **, struct nfssvc_sock *,
struct proc *, struct mbuf **));
int nfs_fsinfo __P((struct nfsmount *, struct vnode *, struct ucred *,
struct proc *p));
+int nfsrv3_access __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_commit __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_create __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_fsinfo __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_getattr __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_link __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_lookup __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_mkdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_mknod __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_noop __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_null __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_pathconf __P((struct nfsrv_descript *nfsd,
+ struct nfssvc_sock *slp, struct proc *procp,
+ struct mbuf **mrq));
+int nfsrv_read __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_readdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_readdirplus __P((struct nfsrv_descript *nfsd,
+ struct nfssvc_sock *slp, struct proc *procp,
+ struct mbuf **mrq));
+int nfsrv_readlink __P((struct nfsrv_descript *nfsd,
+ struct nfssvc_sock *slp, struct proc *procp,
+ struct mbuf **mrq));
+int nfsrv_remove __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_rename __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_rmdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_setattr __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_statfs __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_symlink __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_write __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+
#endif /* KERNEL */
#endif
diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c
index 3f476b2..f497afe 100644
--- a/sys/nfsserver/nfs_srvsock.c
+++ b/sys/nfsserver/nfs_srvsock.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_socket.c 8.3 (Berkeley) 1/12/94
- * $Id: nfs_socket.c,v 1.10 1995/10/29 15:33:04 phk Exp $
+ * $Id: nfs_socket.c,v 1.11 1995/11/21 15:51:32 bde Exp $
*/
/*
@@ -134,82 +134,10 @@ static int nfs_backoff[8] = { 2, 4, 8, 16, 32, 64, 128, 256, };
int nfsrtton = 0;
struct nfsrtt nfsrtt;
-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,
diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c
index a8ecde9..44789f7 100644
--- a/sys/nfsserver/nfs_syscalls.c
+++ b/sys/nfsserver/nfs_syscalls.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_syscalls.c 8.3 (Berkeley) 1/4/94
- * $Id: nfs_syscalls.c,v 1.9 1995/11/14 05:16:37 bde Exp $
+ * $Id: nfs_syscalls.c,v 1.10 1995/11/21 15:51:34 bde Exp $
*/
#include <sys/param.h>
@@ -93,9 +93,6 @@ static int notstarted = 1;
static int modify_flag = 0;
static struct nfsdrt nfsdrt;
-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
diff --git a/sys/nfsserver/nfsrvstats.h b/sys/nfsserver/nfsrvstats.h
index 3e31610..58b1e97 100644
--- a/sys/nfsserver/nfsrvstats.h
+++ b/sys/nfsserver/nfsrvstats.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs.h 8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.13 1995/10/31 21:17:59 joerg Exp $
+ * $Id: nfs.h,v 1.14 1995/11/21 12:54:38 bde Exp $
*/
#ifndef _NFS_NFS_H_
@@ -527,10 +527,12 @@ int nfssvc_nfsd __P((struct nfsd_srvargs *,caddr_t,struct proc *));
int nfssvc_addsock __P((struct file *,struct mbuf *));
void nfsrv_slpderef __P((struct nfssvc_sock *slp));
int nfsrv_dorec __P((struct nfssvc_sock *,struct nfsd *,struct nfsrv_descript **));
+void nfsrv_cleancache __P((void));
int nfsrv_getcache __P((struct nfsrv_descript *,struct nfssvc_sock *,struct mbuf **));
void nfsrv_updatecache __P((struct nfsrv_descript *,int,struct mbuf *));
int mountnfs __P((struct nfs_args *,struct mount *,struct mbuf *,char *,char *,struct vnode **));
int nfs_connect __P((struct nfsmount *,struct nfsreq *));
+void nfs_disconnect __P((struct nfsmount *nmp));
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 *));
@@ -539,17 +541,69 @@ void nfsrv_init __P((int));
void nfs_clearcommit __P((struct mount *));
int nfsrv_errmap __P((struct nfsrv_descript *, int));
void nfsrvw_coalesce __P((struct nfsrv_descript *,struct nfsrv_descript *));
+void nfsrv_rcv __P((struct socket *so, caddr_t arg, int waitflag));
void nfsrvw_sort __P((gid_t [],int));
void nfsrv_setcred __P((struct ucred *,struct ucred *));
int nfs_writebp __P((struct buf *,int));
int nfsrv_vput __P(( struct vnode * ));
int nfsrv_vrele __P(( struct vnode * ));
int nfsrv_vmio __P(( struct vnode * ));
+void nfsrv_wakenfsd __P((struct nfssvc_sock *slp));
int nfsrv_writegather __P((struct nfsrv_descript **, struct nfssvc_sock *,
struct proc *, struct mbuf **));
int nfs_fsinfo __P((struct nfsmount *, struct vnode *, struct ucred *,
struct proc *p));
+int nfsrv3_access __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_commit __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_create __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_fsinfo __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_getattr __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_link __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_lookup __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_mkdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_mknod __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_noop __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_null __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_pathconf __P((struct nfsrv_descript *nfsd,
+ struct nfssvc_sock *slp, struct proc *procp,
+ struct mbuf **mrq));
+int nfsrv_read __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_readdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_readdirplus __P((struct nfsrv_descript *nfsd,
+ struct nfssvc_sock *slp, struct proc *procp,
+ struct mbuf **mrq));
+int nfsrv_readlink __P((struct nfsrv_descript *nfsd,
+ struct nfssvc_sock *slp, struct proc *procp,
+ struct mbuf **mrq));
+int nfsrv_remove __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_rename __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_rmdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_setattr __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_statfs __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_symlink __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+int nfsrv_write __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+ struct proc *procp, struct mbuf **mrq));
+
#endif /* KERNEL */
#endif
OpenPOWER on IntegriCloud