5 files changed, 34 insertions, 14 deletions
diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h
index e1a0f07..2a3b3de 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.9 1995/02/14 06:22:18 phk Exp $
+ * $Id: nfs.h,v 1.10 1995/06/27 11:06:33 dfr Exp $
  */
 
 #ifndef _NFS_NFS_H_
@@ -304,7 +304,7 @@ struct nfsreq {
 /*
  * Queue head for nfsreq's
  */
-TAILQ_HEAD(, nfsreq) nfs_reqq;
+extern TAILQ_HEAD(nfs_reqq, nfsreq) nfs_reqq;
 
 /* Flag values for r_flags */
 #define R_TIMING	0x01		/* timing request (in mntp) */
@@ -398,8 +398,8 @@ struct nfssvc_sock {
 #define	SLP_LASTFRAG	0x20
 #define SLP_ALLFLAGS	0xff
 
-TAILQ_HEAD(, nfssvc_sock) nfssvc_sockhead;
-int nfssvc_sockhead_flag;
+extern TAILQ_HEAD(nfssvc_sockhead, nfssvc_sock) nfssvc_sockhead;
+extern int nfssvc_sockhead_flag;
 #define	SLP_INIT	0x01
 #define	SLP_WANTINIT	0x02
 
@@ -464,8 +464,8 @@ struct nfsrv_descript {
 #define ND_KERBFULL	0x40
 #define ND_KERBAUTH	(ND_KERBNICK | ND_KERBFULL)
 
-TAILQ_HEAD(, nfsd) nfsd_head;
-int nfsd_head_flag;
+extern TAILQ_HEAD(nfsd_head, nfsd) nfsd_head;
+extern int nfsd_head_flag;
 #define	NFSD_CHECKSLP	0x01
 
 /*
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index f01e1b0..4c6d4bb 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.20 1995/07/13 08:47:53 davidg Exp $
+ * $Id: nfs_subs.c,v 1.21 1995/07/20 09:43:12 davidg Exp $
  */
 
 /*
@@ -94,6 +94,16 @@ enum vtype nv2tov_type[8] = { VNON, VREG, VDIR, VBLK, VCHR, VLNK, VNON, VNON };
 enum vtype nv3tov_type[8]={ VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO };
 int nfs_ticks;
 
+struct nfs_reqq nfs_reqq;
+struct nfssvc_sockhead nfssvc_sockhead;
+int nfssvc_sockhead_flag;
+struct nfsd_head nfsd_head;
+int nfsd_head_flag;
+struct nfs_bufq nfs_bufq;
+struct nqtimerhead nqtimerhead;
+struct nqfhhashhead *nqfhhashtbl;
+u_long nqfhhash;
+
 /*
  * Mapping of old NFS Version 2 RPC numbers to generic numbers.
  */
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index f01e1b0..4c6d4bb 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.20 1995/07/13 08:47:53 davidg Exp $
+ * $Id: nfs_subs.c,v 1.21 1995/07/20 09:43:12 davidg Exp $
  */
 
 /*
@@ -94,6 +94,16 @@ enum vtype nv2tov_type[8] = { VNON, VREG, VDIR, VBLK, VCHR, VLNK, VNON, VNON };
 enum vtype nv3tov_type[8]={ VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO };
 int nfs_ticks;
 
+struct nfs_reqq nfs_reqq;
+struct nfssvc_sockhead nfssvc_sockhead;
+int nfssvc_sockhead_flag;
+struct nfsd_head nfsd_head;
+int nfsd_head_flag;
+struct nfs_bufq nfs_bufq;
+struct nqtimerhead nqtimerhead;
+struct nqfhhashhead *nqfhhashtbl;
+u_long nqfhhash;
+
 /*
  * Mapping of old NFS Version 2 RPC numbers to generic numbers.
  */
diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h
index 18dbde2..0bd359f 100644
--- a/sys/nfs/nfsnode.h
+++ b/sys/nfs/nfsnode.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.4 (Berkeley) 2/13/94
- * $Id: nfsnode.h,v 1.9 1995/03/16 18:15:42 bde Exp $
+ * $Id: nfsnode.h,v 1.10 1995/06/27 11:06:57 dfr Exp $
  */
 
 #ifndef _NFS_NFSNODE_H_
@@ -148,7 +148,7 @@ struct nfsnode {
 /*
  * Queue head for nfsiod's
  */
-TAILQ_HEAD(, buf) nfs_bufq;
+extern TAILQ_HEAD(nfs_bufq, buf) nfs_bufq;
 
 #if defined(KERNEL) || defined(_KERNEL)
 extern	int	(**fifo_nfsv2nodeop_p)();
diff --git a/sys/nfs/nqnfs.h b/sys/nfs/nqnfs.h
index 194bc90..3861ac6 100644
--- a/sys/nfs/nqnfs.h
+++ b/sys/nfs/nqnfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nqnfs.h	8.1 (Berkeley) 6/10/93
- * $Id: nqnfs.h,v 1.6 1994/10/17 17:47:45 phk Exp $
+ * $Id: nqnfs.h,v 1.7 1995/06/27 11:07:01 dfr Exp $
  */
 
 #ifndef _NFS_NQNFS_H_
@@ -181,15 +181,15 @@ struct nqm {
 /*
  * List head for timer queue.
  */
-CIRCLEQ_HEAD(, nqlease) nqtimerhead;
+extern CIRCLEQ_HEAD(nqtimerhead, nqlease) nqtimerhead;
 
 /*
  * List head for the file handle hash table.
  */
 #define	NQFHHASH(f) \
 	(&nqfhhashtbl[(*((u_long *)(f))) & nqfhhash])
-LIST_HEAD(nqfhhashhead, nqlease) *nqfhhashtbl;
-u_long nqfhhash;
+extern LIST_HEAD(nqfhhashhead, nqlease) *nqfhhashtbl;
+extern u_long nqfhhash;
 
 /*
  * Nqnfs return status numbers.