diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2002-10-29 12:47:07 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2002-10-29 12:47:07 +0000 |
| commit | d14216b62186ac44ecda8e4d1d56ed2a08576575 (patch) | |
| tree | 298c8d8b6a07a7df90b80030c78f7c2de0e60e18 | |
| parent | 395da43bec632ccfe924afe30535cbd3f5e67836 (diff) | |
Get rid of some commons.
| -rw-r--r-- | sys/nfs/nfs.h | 12 | ||||
| -rw-r--r-- | sys/nfs/nfs_socket.c | 4 | ||||
| -rw-r--r-- | sys/nfs/nfs_syscalls.c | 8 |
3 files changed, 16 insertions, 8 deletions
diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h index c793b7fede8..7b3c271de16 100644 --- a/sys/nfs/nfs.h +++ b/sys/nfs/nfs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs.h,v 1.17 2002/02/10 22:02:05 nate Exp $ */ +/* $OpenBSD: nfs.h,v 1.18 2002/10/29 12:47:06 art Exp $ */ /* $NetBSD: nfs.h,v 1.10.4.1 1996/05/27 11:23:56 fvdl Exp $ */ /* @@ -281,7 +281,7 @@ struct nfsreq { /* * Queue head for nfsreq's */ -TAILQ_HEAD(, nfsreq) nfs_reqq; +extern TAILQ_HEAD(nfsreqhead, nfsreq) nfs_reqq; /* Flag values for r_flags */ #define R_TIMING 0x01 /* timing request (in mntp) */ @@ -375,8 +375,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 @@ -439,8 +439,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(nfsdhead, nfsd) nfsd_head; +extern int nfsd_head_flag; #define NFSD_CHECKSLP 0x01 /* diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c index 8369f4811ef..a2e6760bb09 100644 --- a/sys/nfs/nfs_socket.c +++ b/sys/nfs/nfs_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_socket.c,v 1.31 2002/08/01 22:38:44 csapuntz Exp $ */ +/* $OpenBSD: nfs_socket.c,v 1.32 2002/10/29 12:47:06 art Exp $ */ /* $NetBSD: nfs_socket.c,v 1.27 1996/04/15 20:20:00 thorpej Exp $ */ /* @@ -140,6 +140,8 @@ void nfs_realign(struct mbuf **, int); unsigned int nfs_realign_test = 0; unsigned int nfs_realign_count = 0; +struct nfsreqhead nfs_reqq; + /* * Initialize sockets and congestion for a new NFS connection. * We do not free the sockaddr if error. diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c index 9360e2c18e5..2e74641ecf6 100644 --- a/sys/nfs/nfs_syscalls.c +++ b/sys/nfs/nfs_syscalls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_syscalls.c,v 1.34 2002/08/23 22:21:44 art Exp $ */ +/* $OpenBSD: nfs_syscalls.c,v 1.35 2002/10/29 12:47:06 art Exp $ */ /* $NetBSD: nfs_syscalls.c,v 1.19 1996/02/18 11:53:52 fvdl Exp $ */ /* @@ -98,6 +98,12 @@ static int nfs_numnfsd = 0; static struct nfsdrt nfsdrt; #endif +struct nfssvc_sockhead nfssvc_sockhead; +struct nfsdhead nfsd_head; + +int nfssvc_sockhead_flag; +int nfsd_head_flag; + #define TRUE 1 #define FALSE 0 |