lockd: fix two struct definitions (fwd)
Subsystems (2)
PATCH 1/1 lockd: fix two struct definitions (fwd)
The patch forwarded below dtill applies and compiles against 2.6.10-rc2-mm3.
Please apply.
----- Forwarded message from Adrian Bunk <[email protected]> -----
Date: Wed, 3 Nov 2004 22:47:32 +0100
From: Adrian Bunk <[email protected]>
To: [email protected], [email protected],
[email protected], [email protected]
Subject: [2.6 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.
diffstat output:
fs/lockd/mon.c | 4 ++-- fs/lockd/svc.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-)
fs/lockd/mon.c renamed from fs/lockd/mon.c.old +2 -2
@@ -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_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 ]),
fs/lockd/svc.c renamed from fs/lockd/svc.c.old +8 -8
@@ -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_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 */ };
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
----- End forwarded message -----