aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2005-01-07 22:22:11 -0800
committerLinus Torvalds <torvalds@evo.osdl.org>2005-01-07 22:22:11 -0800
commit3404c3c1a4a525f92a95ae946e9b3e3bc3a8f2e5 (patch)
treec108165e56215a625567cf994dcc4c114431b311 /fs
parent7e6ff53744dd644570da3dbc404427f4b9f2dc90 (diff)
downloadhistory-3404c3c1a4a525f92a95ae946e9b3e3bc3a8f2e5.tar.gz
[PATCH] lockd: fix two struct definitions
Under fs/lockd/, there are two structs declared extern although they are in the same file. Furtheremore, they don't have to be global since their only users are in the same file. Most of the changes to svc.c are only indent fixes caused by making the struct static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/lockd/mon.c4
-rw-r--r--fs/lockd/svc.c16
2 files changed, 10 insertions, 10 deletions
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index a9f08284cf2d25..6fc1bebeec1df1 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -19,7 +19,7 @@
static struct rpc_clnt * nsm_create(void);
-extern struct rpc_program nsm_program;
+static struct rpc_program nsm_program;
/*
* Local NSM state
@@ -237,7 +237,7 @@ static struct rpc_version * nsm_version[] = {
static struct rpc_stat nsm_stats;
-struct rpc_program nsm_program = {
+static struct rpc_program nsm_program = {
.name = "statd",
.number = SM_PROGRAM,
.nrvers = sizeof(nsm_version)/sizeof(nsm_version[0]),
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 3195b5cb537599..d3ee09c5196eb0 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -38,7 +38,7 @@
#define LOCKD_BUFSIZE (1024 + NLMSVC_XDRSIZE)
#define ALLOWED_SIGS (sigmask(SIGKILL))
-extern struct svc_program nlmsvc_program;
+static struct svc_program nlmsvc_program;
struct nlmsvc_binding * nlmsvc_ops;
EXPORT_SYMBOL(nlmsvc_ops);
@@ -476,11 +476,11 @@ static struct svc_version * nlmsvc_version[] = {
static struct svc_stat nlmsvc_stats;
#define NLM_NRVERS (sizeof(nlmsvc_version)/sizeof(nlmsvc_version[0]))
-struct svc_program nlmsvc_program = {
- .pg_prog = NLM_PROGRAM, /* program number */
- .pg_nvers = NLM_NRVERS, /* number of entries in nlmsvc_version */
- .pg_vers = nlmsvc_version, /* version table */
- .pg_name = "lockd", /* service name */
- .pg_class = "nfsd", /* share authentication with nfsd */
- .pg_stats = &nlmsvc_stats, /* stats table */
+static struct svc_program nlmsvc_program = {
+ .pg_prog = NLM_PROGRAM, /* program number */
+ .pg_nvers = NLM_NRVERS, /* number of entries in nlmsvc_version */
+ .pg_vers = nlmsvc_version, /* version table */
+ .pg_name = "lockd", /* service name */
+ .pg_class = "nfsd", /* share authentication with nfsd */
+ .pg_stats = &nlmsvc_stats, /* stats table */
};