summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThordur I. Bjornsson <thib@cvs.openbsd.org>2006-11-01 00:12:36 +0000
committerThordur I. Bjornsson <thib@cvs.openbsd.org>2006-11-01 00:12:36 +0000
commit6d778830093fc44aa1a1521bc23397ed334a35c4 (patch)
tree03fbea850ac51653c85e8045acb0fbd468ef47c5
parent11f5c053cc436fd41fd6e0494676ae2771ba05e2 (diff)
move the declaration of nfsstats from nfs_bio.c to
nfs_subs.c so it gets pulled in for NFSSERVER only kernels. ok deraadt@,krw@
-rw-r--r--sys/nfs/nfs_bio.c4
-rw-r--r--sys/nfs/nfs_subs.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c
index 1cbc3faec10..480fe1e76bd 100644
--- a/sys/nfs/nfs_bio.c
+++ b/sys/nfs/nfs_bio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_bio.c,v 1.42 2006/04/20 14:43:32 pedro Exp $ */
+/* $OpenBSD: nfs_bio.c,v 1.43 2006/11/01 00:12:35 thib Exp $ */
/* $NetBSD: nfs_bio.c,v 1.25.4.2 1996/07/08 20:47:04 jtc Exp $ */
/*
@@ -57,7 +57,7 @@
extern struct proc *nfs_iodwant[NFS_MAXASYNCDAEMON];
extern int nfs_numasync;
-struct nfsstats nfsstats;
+extern struct nfsstats nfsstats;
struct nfs_bufqhead nfs_bufq;
/*
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 713dc101095..6288fe1da0d 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_subs.c,v 1.57 2006/05/29 16:49:42 avsm Exp $ */
+/* $OpenBSD: nfs_subs.c,v 1.58 2006/11/01 00:12:35 thib Exp $ */
/* $NetBSD: nfs_subs.c,v 1.27.4.3 1996/07/08 20:34:24 jtc Exp $ */
/*
@@ -102,6 +102,7 @@ nfstype nfsv3_type[9] = { NFNON, NFREG, NFDIR, NFBLK, NFCHR, NFLNK, NFSOCK,
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 nfsstats nfsstats;
/*
* Mapping of old NFS Version 2 RPC numbers to generic numbers.