summaryrefslogtreecommitdiffstats
path: root/sys/nfs
diff options
context:
space:
mode:
Diffstat (limited to 'sys/nfs')
-rw-r--r--sys/nfs/bootp_subr.c19
-rw-r--r--sys/nfs/nfs_node.c8
-rw-r--r--sys/nfs/nfs_serv.c4
-rw-r--r--sys/nfs/nfs_srvcache.c10
-rw-r--r--sys/nfs/nfs_syscalls.c4
-rw-r--r--sys/nfs/nfs_vfsops.c7
6 files changed, 27 insertions, 25 deletions
diff --git a/sys/nfs/bootp_subr.c b/sys/nfs/bootp_subr.c
index 1712a80..891b935 100644
--- a/sys/nfs/bootp_subr.c
+++ b/sys/nfs/bootp_subr.c
@@ -1,4 +1,4 @@
-/* $Id: bootp_subr.c,v 1.7 1998/01/09 03:21:07 eivind Exp $ */
+/* $Id: bootp_subr.c,v 1.8 1998/01/18 18:46:20 tegge Exp $ */
/*
* Copyright (c) 1995 Gordon Ross, Adam Glass
@@ -129,14 +129,15 @@ void bootpboot_p_rtlist(void);
void bootpboot_p_iflist(void);
#endif
-int bootpc_call(struct bootp_packet *call,
- struct bootp_packet *reply,
- struct proc *procp);
+static int bootpc_call(struct bootp_packet *call,
+ struct bootp_packet *reply,
+ struct proc *procp);
-int bootpc_fakeup_interface(struct ifreq *ireq,struct socket *so,
+static int bootpc_fakeup_interface(struct ifreq *ireq,
+ struct socket *so,
struct proc *procp);
-int
+static int
bootpc_adjust_interface(struct ifreq *ireq,struct socket *so,
struct sockaddr_in *myaddr,
struct sockaddr_in *netmask,
@@ -252,7 +253,7 @@ void bootpboot_p_iflist(void)
}
#endif
-int
+static int
bootpc_call(call,reply,procp)
struct bootp_packet *call;
struct bootp_packet *reply; /* output */
@@ -421,7 +422,7 @@ bootpc_call(call,reply,procp)
return error;
}
-int
+static int
bootpc_fakeup_interface(struct ifreq *ireq,struct socket *so,
struct proc *procp)
{
@@ -511,7 +512,7 @@ bootpc_fakeup_interface(struct ifreq *ireq,struct socket *so,
return error;
}
-int
+static int
bootpc_adjust_interface(struct ifreq *ireq,struct socket *so,
struct sockaddr_in *myaddr,
struct sockaddr_in *netmask,
diff --git a/sys/nfs/nfs_node.c b/sys/nfs/nfs_node.c
index 1c6397b..48d0baf 100644
--- a/sys/nfs/nfs_node.c
+++ b/sys/nfs/nfs_node.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_node.c 8.6 (Berkeley) 5/22/95
- * $Id: nfs_node.c,v 1.22 1997/10/28 14:06:20 bde Exp $
+ * $Id: nfs_node.c,v 1.23 1997/12/27 02:56:33 bde Exp $
*/
@@ -56,8 +56,8 @@
static MALLOC_DEFINE(M_NFSNODE, "NFS node", "NFS vnode private part");
-LIST_HEAD(nfsnodehashhead, nfsnode) *nfsnodehashtbl;
-u_long nfsnodehash;
+static LIST_HEAD(nfsnodehashhead, nfsnode) *nfsnodehashtbl;
+static u_long nfsnodehash;
#define TRUE 1
#define FALSE 0
@@ -102,7 +102,7 @@ nfs_hash(fhp, fhsize)
* In all cases, a pointer to a
* nfsnode structure is returned.
*/
-int nfs_node_hash_lock;
+static int nfs_node_hash_lock;
int
nfs_nget(mntp, fhp, fhsize, npp)
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index e24be24..19d09f4 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_serv.c 8.3 (Berkeley) 1/12/94
- * $Id: nfs_serv.c,v 1.56 1998/02/04 22:33:14 eivind Exp $
+ * $Id: nfs_serv.c,v 1.57 1998/02/06 12:13:56 eivind Exp $
*/
/*
@@ -99,7 +99,7 @@ extern struct nfsstats nfsstats;
int nfsrvw_procrastinate = NFS_GATHERDELAY * 1000;
int nfsrvw_procrastinate_v3 = 0;
-int nfs_async;
+static int nfs_async;
SYSCTL_INT(_vfs_nfs, OID_AUTO, async, CTLFLAG_RW, &nfs_async, 0, "");
static int nfsrv_access __P((struct vnode *,int,struct ucred *,int,
diff --git a/sys/nfs/nfs_srvcache.c b/sys/nfs/nfs_srvcache.c
index 14eaedd..1731d8e 100644
--- a/sys/nfs/nfs_srvcache.c
+++ b/sys/nfs/nfs_srvcache.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_srvcache.c 8.3 (Berkeley) 3/30/95
- * $Id: nfs_srvcache.c,v 1.14 1997/08/16 19:15:58 wollman Exp $
+ * $Id: nfs_srvcache.c,v 1.15 1997/10/12 20:25:46 phk Exp $
*/
#ifndef NFS_NOSERVER
@@ -62,14 +62,14 @@
extern struct nfsstats nfsstats;
extern int nfsv2_procid[NFS_NPROCS];
-long numnfsrvcache;
+static long numnfsrvcache;
static long desirednfsrvcache = NFSRVCACHESIZ;
#define NFSRCHASH(xid) \
(&nfsrvhashtbl[((xid) + ((xid) >> 24)) & nfsrvhash])
-LIST_HEAD(nfsrvhash, nfsrvcache) *nfsrvhashtbl;
-TAILQ_HEAD(nfsrvlru, nfsrvcache) nfsrvlruhead;
-u_long nfsrvhash;
+static LIST_HEAD(nfsrvhash, nfsrvcache) *nfsrvhashtbl;
+static TAILQ_HEAD(nfsrvlru, nfsrvcache) nfsrvlruhead;
+static u_long nfsrvhash;
#define TRUE 1
#define FALSE 0
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index 51fdeb8..ba460fc 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_syscalls.c 8.5 (Berkeley) 3/30/95
- * $Id: nfs_syscalls.c,v 1.34 1998/02/04 22:33:16 eivind Exp $
+ * $Id: nfs_syscalls.c,v 1.35 1998/02/06 12:13:57 eivind Exp $
*/
#include <sys/param.h>
@@ -747,7 +747,7 @@ done:
}
#endif /* NFS_NOSERVER */
-int nfs_defect = 0;
+static int nfs_defect = 0;
SYSCTL_INT(_vfs_nfs, OID_AUTO, defect, CTLFLAG_RW, &nfs_defect, 0, "");
/*
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c
index 2776fac..f66d3ba 100644
--- a/sys/nfs/nfs_vfsops.c
+++ b/sys/nfs/nfs_vfsops.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_vfsops.c 8.12 (Berkeley) 5/20/95
- * $Id: nfs_vfsops.c,v 1.52 1997/11/12 05:42:21 julian Exp $
+ * $Id: nfs_vfsops.c,v 1.53 1998/02/05 16:40:57 dyson Exp $
*/
#include <sys/param.h>
@@ -162,7 +162,7 @@ static int nfs_mountdiskless __P((char *, char *, int,
struct sockaddr_in *, struct nfs_args *,
struct proc *, struct vnode **,
struct mount **));
-void nfs_convert_diskless __P((void));
+static void nfs_convert_diskless __P((void));
static void nfs_convert_oargs __P((struct nfs_args *args,
struct onfs_args *oargs));
@@ -206,7 +206,8 @@ static void nfs_convert_oargs(args,oargs)
args->hostname = oargs->hostname;
}
-void nfs_convert_diskless()
+static void
+nfs_convert_diskless()
{
bcopy(&nfs_diskless.myif, &nfsv3_diskless.myif,
sizeof(struct ifaliasreq));
OpenPOWER on IntegriCloud