Skip to content

L
linux
Commit aa8217d5 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Anna Schumaker
Browse files
Options

sunrpc: mark all struct svc_version instances as const 

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent b9c744c1
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 65 deletions
fs/lockd/svc.c
View file @ aa8217d5
...@@ -740,32 +740,32 @@ module_exit(exit_nlm); ...@@ -740,32 +740,32 @@ module_exit(exit_nlm);
* Define NLM program and procedures * Define NLM program and procedures
*/ */
static unsigned int nlmsvc_version1_count[17]; static unsigned int nlmsvc_version1_count[17];
static struct svc_version nlmsvc_version1 = { static const struct svc_version nlmsvc_version1 = {
.vs_vers = 1, .vs_vers = 1,
.vs_nproc = 17, .vs_nproc = 17,
.vs_proc = nlmsvc_procedures, .vs_proc = nlmsvc_procedures,
.vs_count = nlmsvc_version1_count, .vs_count = nlmsvc_version1_count,
.vs_xdrsize = NLMSVC_XDRSIZE, .vs_xdrsize = NLMSVC_XDRSIZE,
}; };
static unsigned int nlmsvc_version3_count[24]; static unsigned int nlmsvc_version3_count[24];
static struct svc_version nlmsvc_version3 = { static const struct svc_version nlmsvc_version3 = {
.vs_vers = 3, .vs_vers = 3,
.vs_nproc = 24, .vs_nproc = 24,
.vs_proc = nlmsvc_procedures, .vs_proc = nlmsvc_procedures,
.vs_count = nlmsvc_version3_count, .vs_count = nlmsvc_version3_count,
.vs_xdrsize = NLMSVC_XDRSIZE, .vs_xdrsize = NLMSVC_XDRSIZE,
}; };
#ifdef CONFIG_LOCKD_V4 #ifdef CONFIG_LOCKD_V4
static unsigned int nlmsvc_version4_count[24]; static unsigned int nlmsvc_version4_count[24];
static struct svc_version nlmsvc_version4 = { static const struct svc_version nlmsvc_version4 = {
.vs_vers = 4, .vs_vers = 4,
.vs_nproc = 24, .vs_nproc = 24,
.vs_proc = nlmsvc_procedures4, .vs_proc = nlmsvc_procedures4,
.vs_count = nlmsvc_version4_count, .vs_count = nlmsvc_version4_count,
.vs_xdrsize = NLMSVC_XDRSIZE, .vs_xdrsize = NLMSVC_XDRSIZE,
}; };
#endif #endif
static struct svc_version * nlmsvc_version[] = { static const struct svc_version *nlmsvc_version[] = {
[1] = &nlmsvc_version1, [1] = &nlmsvc_version1,
[3] = &nlmsvc_version3, [3] = &nlmsvc_version3,
#ifdef CONFIG_LOCKD_V4 #ifdef CONFIG_LOCKD_V4
......
fs/nfs/callback.c
View file @ aa8217d5
...@@ -439,7 +439,7 @@ static int nfs_callback_authenticate(struct svc_rqst *rqstp) ...@@ -439,7 +439,7 @@ static int nfs_callback_authenticate(struct svc_rqst *rqstp)
/* /*
* Define NFS4 callback program * Define NFS4 callback program
*/ */
static struct svc_version *nfs4_callback_version[] = { static const struct svc_version *nfs4_callback_version[] = {
[1] = &nfs4_callback_version1, [1] = &nfs4_callback_version1,
[4] = &nfs4_callback_version4, [4] = &nfs4_callback_version4,
}; };
......
fs/nfs/callback_xdr.c
View file @ aa8217d5
...@@ -1012,7 +1012,7 @@ static const struct svc_procedure nfs4_callback_procedures1[] = { ...@@ -1012,7 +1012,7 @@ static const struct svc_procedure nfs4_callback_procedures1[] = {
}; };
static unsigned int nfs4_callback_count1[ARRAY_SIZE(nfs4_callback_procedures1)]; static unsigned int nfs4_callback_count1[ARRAY_SIZE(nfs4_callback_procedures1)];
struct svc_version nfs4_callback_version1 = { const struct svc_version nfs4_callback_version1 = {
.vs_vers = 1, .vs_vers = 1,
.vs_nproc = ARRAY_SIZE(nfs4_callback_procedures1), .vs_nproc = ARRAY_SIZE(nfs4_callback_procedures1),
.vs_proc = nfs4_callback_procedures1, .vs_proc = nfs4_callback_procedures1,
...@@ -1024,7 +1024,7 @@ struct svc_version nfs4_callback_version1 = { ...@@ -1024,7 +1024,7 @@ struct svc_version nfs4_callback_version1 = {
}; };
static unsigned int nfs4_callback_count4[ARRAY_SIZE(nfs4_callback_procedures1)]; static unsigned int nfs4_callback_count4[ARRAY_SIZE(nfs4_callback_procedures1)];
struct svc_version nfs4_callback_version4 = { const struct svc_version nfs4_callback_version4 = {
.vs_vers = 4, .vs_vers = 4,
.vs_nproc = ARRAY_SIZE(nfs4_callback_procedures1), .vs_nproc = ARRAY_SIZE(nfs4_callback_procedures1),
.vs_proc = nfs4_callback_procedures1, .vs_proc = nfs4_callback_procedures1,
......
fs/nfs/internal.h
View file @ aa8217d5
...@@ -225,8 +225,8 @@ static inline void nfs_fs_proc_exit(void) ...@@ -225,8 +225,8 @@ static inline void nfs_fs_proc_exit(void)
#endif #endif
/* callback_xdr.c */ /* callback_xdr.c */
extern struct svc_version nfs4_callback_version1; extern const struct svc_version nfs4_callback_version1;
extern struct svc_version nfs4_callback_version4; extern const struct svc_version nfs4_callback_version4;
struct nfs_pageio_descriptor; struct nfs_pageio_descriptor;
/* pagelist.c */ /* pagelist.c */
......
fs/nfs/nfs4_fs.h
View file @ aa8217d5
...@@ -498,8 +498,8 @@ extern const struct rpc_procinfo nfs4_procedures[]; ...@@ -498,8 +498,8 @@ extern const struct rpc_procinfo nfs4_procedures[];
struct nfs4_mount_data; struct nfs4_mount_data;
/* callback_xdr.c */ /* callback_xdr.c */
extern struct svc_version nfs4_callback_version1; extern const struct svc_version nfs4_callback_version1;
extern struct svc_version nfs4_callback_version4; extern const struct svc_version nfs4_callback_version4;
static inline void nfs4_stateid_copy(nfs4_stateid *dst, const nfs4_stateid *src) static inline void nfs4_stateid_copy(nfs4_stateid *dst, const nfs4_stateid *src)
{ {
......
fs/nfsd/nfs2acl.c
View file @ aa8217d5
...@@ -379,11 +379,11 @@ static const struct svc_procedure nfsd_acl_procedures2[] = { ...@@ -379,11 +379,11 @@ static const struct svc_procedure nfsd_acl_procedures2[] = {
}; };
static unsigned int nfsd_acl_count2[ARRAY_SIZE(nfsd_acl_procedures2)]; static unsigned int nfsd_acl_count2[ARRAY_SIZE(nfsd_acl_procedures2)];
struct svc_version nfsd_acl_version2 = { const struct svc_version nfsd_acl_version2 = {
.vs_vers = 2, .vs_vers = 2,
.vs_nproc = 5, .vs_nproc = 5,
.vs_proc = nfsd_acl_procedures2, .vs_proc = nfsd_acl_procedures2,
.vs_count = nfsd_acl_count2, .vs_count = nfsd_acl_count2,
.vs_dispatch = nfsd_dispatch, .vs_dispatch = nfsd_dispatch,
.vs_xdrsize = NFS3_SVC_XDRSIZE, .vs_xdrsize = NFS3_SVC_XDRSIZE,
}; };
fs/nfsd/nfs3acl.c
View file @ aa8217d5
...@@ -264,12 +264,12 @@ static const struct svc_procedure nfsd_acl_procedures3[] = { ...@@ -264,12 +264,12 @@ static const struct svc_procedure nfsd_acl_procedures3[] = {
}; };
static unsigned int nfsd_acl_count3[ARRAY_SIZE(nfsd_acl_procedures3)]; static unsigned int nfsd_acl_count3[ARRAY_SIZE(nfsd_acl_procedures3)];
struct svc_version nfsd_acl_version3 = { const struct svc_version nfsd_acl_version3 = {
.vs_vers = 3, .vs_vers = 3,
.vs_nproc = 3, .vs_nproc = 3,
.vs_proc = nfsd_acl_procedures3, .vs_proc = nfsd_acl_procedures3,
.vs_count = nfsd_acl_count3, .vs_count = nfsd_acl_count3,
.vs_dispatch = nfsd_dispatch, .vs_dispatch = nfsd_dispatch,
.vs_xdrsize = NFS3_SVC_XDRSIZE, .vs_xdrsize = NFS3_SVC_XDRSIZE,
}; };
fs/nfsd/nfs3proc.c
View file @ aa8217d5
...@@ -891,11 +891,11 @@ static const struct svc_procedure nfsd_procedures3[22] = { ...@@ -891,11 +891,11 @@ static const struct svc_procedure nfsd_procedures3[22] = {
}; };
static unsigned int nfsd_count3[ARRAY_SIZE(nfsd_procedures3)]; static unsigned int nfsd_count3[ARRAY_SIZE(nfsd_procedures3)];
struct svc_version nfsd_version3 = { const struct svc_version nfsd_version3 = {
.vs_vers = 3, .vs_vers = 3,
.vs_nproc = 22, .vs_nproc = 22,
.vs_proc = nfsd_procedures3, .vs_proc = nfsd_procedures3,
.vs_count = nfsd_count3, .vs_dispatch = nfsd_dispatch,
.vs_dispatch = nfsd_dispatch, .vs_count = nfsd_count3,
.vs_xdrsize = NFS3_SVC_XDRSIZE, .vs_xdrsize = NFS3_SVC_XDRSIZE,
}; };
fs/nfsd/nfs4proc.c
View file @ aa8217d5
...@@ -2554,7 +2554,7 @@ static const struct svc_procedure nfsd_procedures4[2] = { ...@@ -2554,7 +2554,7 @@ static const struct svc_procedure nfsd_procedures4[2] = {
}; };
static unsigned int nfsd_count3[ARRAY_SIZE(nfsd_procedures4)]; static unsigned int nfsd_count3[ARRAY_SIZE(nfsd_procedures4)];
struct svc_version nfsd_version4 = { const struct svc_version nfsd_version4 = {
.vs_vers = 4, .vs_vers = 4,
.vs_nproc = 2, .vs_nproc = 2,
.vs_proc = nfsd_procedures4, .vs_proc = nfsd_procedures4,
......
fs/nfsd/nfsd.h
View file @ aa8217d5
...@@ -60,7 +60,7 @@ struct readdir_cd { ...@@ -60,7 +60,7 @@ struct readdir_cd {
extern struct svc_program nfsd_program; extern struct svc_program nfsd_program;
extern struct svc_version nfsd_version2, nfsd_version3, extern const struct svc_version nfsd_version2, nfsd_version3,
nfsd_version4; nfsd_version4;
extern struct mutex nfsd_mutex; extern struct mutex nfsd_mutex;
extern spinlock_t nfsd_drc_lock; extern spinlock_t nfsd_drc_lock;
...@@ -86,12 +86,12 @@ void nfsd_destroy(struct net *net); ...@@ -86,12 +86,12 @@ void nfsd_destroy(struct net *net);
#if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) #if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL)
#ifdef CONFIG_NFSD_V2_ACL #ifdef CONFIG_NFSD_V2_ACL
extern struct svc_version nfsd_acl_version2; extern const struct svc_version nfsd_acl_version2;
#else #else
#define nfsd_acl_version2 NULL #define nfsd_acl_version2 NULL
#endif #endif
#ifdef CONFIG_NFSD_V3_ACL #ifdef CONFIG_NFSD_V3_ACL
extern struct svc_version nfsd_acl_version3; extern const struct svc_version nfsd_acl_version3;
#else #else
#define nfsd_acl_version3 NULL #define nfsd_acl_version3 NULL
#endif #endif
......
fs/nfsd/nfsproc.c
View file @ aa8217d5
...@@ -744,13 +744,13 @@ static const struct svc_procedure nfsd_procedures2[18] = { ...@@ -744,13 +744,13 @@ static const struct svc_procedure nfsd_procedures2[18] = {
static unsigned int nfsd_count2[ARRAY_SIZE(nfsd_procedures2)]; static unsigned int nfsd_count2[ARRAY_SIZE(nfsd_procedures2)];
struct svc_version nfsd_version2 = { const struct svc_version nfsd_version2 = {
.vs_vers = 2, .vs_vers = 2,
.vs_nproc = 18, .vs_nproc = 18,
.vs_proc = nfsd_procedures2, .vs_proc = nfsd_procedures2,
.vs_count = nfsd_count2, .vs_count = nfsd_count2,
.vs_dispatch = nfsd_dispatch, .vs_dispatch = nfsd_dispatch,
.vs_xdrsize = NFS2_SVC_XDRSIZE, .vs_xdrsize = NFS2_SVC_XDRSIZE,
}; };
/* /*
......
fs/nfsd/nfssvc.c
View file @ aa8217d5
...@@ -68,14 +68,14 @@ unsigned long nfsd_drc_mem_used; ...@@ -68,14 +68,14 @@ unsigned long nfsd_drc_mem_used;
#if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) #if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL)
static struct svc_stat nfsd_acl_svcstats; static struct svc_stat nfsd_acl_svcstats;
static struct svc_version * nfsd_acl_version[] = { static const struct svc_version *nfsd_acl_version[] = {
[2] = &nfsd_acl_version2, [2] = &nfsd_acl_version2,
[3] = &nfsd_acl_version3, [3] = &nfsd_acl_version3,
}; };
#define NFSD_ACL_MINVERS 2 #define NFSD_ACL_MINVERS 2
#define NFSD_ACL_NRVERS ARRAY_SIZE(nfsd_acl_version) #define NFSD_ACL_NRVERS ARRAY_SIZE(nfsd_acl_version)
static struct svc_version *nfsd_acl_versions[NFSD_ACL_NRVERS]; static const struct svc_version *nfsd_acl_versions[NFSD_ACL_NRVERS];
static struct svc_program nfsd_acl_program = { static struct svc_program nfsd_acl_program = {
.pg_prog = NFS_ACL_PROGRAM, .pg_prog = NFS_ACL_PROGRAM,
...@@ -92,7 +92,7 @@ static struct svc_stat nfsd_acl_svcstats = { ...@@ -92,7 +92,7 @@ static struct svc_stat nfsd_acl_svcstats = {
}; };
#endif /* defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) */ #endif /* defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) */
static struct svc_version * nfsd_version[] = { static const struct svc_version *nfsd_version[] = {
[2] = &nfsd_version2, [2] = &nfsd_version2,
#if defined(CONFIG_NFSD_V3) #if defined(CONFIG_NFSD_V3)
[3] = &nfsd_version3, [3] = &nfsd_version3,
...@@ -104,7 +104,7 @@ static struct svc_version * nfsd_version[] = { ...@@ -104,7 +104,7 @@ static struct svc_version * nfsd_version[] = {
#define NFSD_MINVERS 2 #define NFSD_MINVERS 2
#define NFSD_NRVERS ARRAY_SIZE(nfsd_version) #define NFSD_NRVERS ARRAY_SIZE(nfsd_version)
static struct svc_version *nfsd_versions[NFSD_NRVERS]; static const struct svc_version *nfsd_versions[NFSD_NRVERS];
struct svc_program nfsd_program = { struct svc_program nfsd_program = {
#if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) #if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL)
......
include/linux/sunrpc/svc.h
View file @ aa8217d5
...@@ -384,7 +384,7 @@ struct svc_program { ...@@ -384,7 +384,7 @@ struct svc_program {
unsigned int pg_lovers; /* lowest version */ unsigned int pg_lovers; /* lowest version */
unsigned int pg_hivers; /* highest version */ unsigned int pg_hivers; /* highest version */
unsigned int pg_nvers; /* number of versions */ unsigned int pg_nvers; /* number of versions */
struct svc_version ** pg_vers; /* version array */ const struct svc_version **pg_vers; /* version array */
char * pg_name; /* service name */ char * pg_name; /* service name */
char * pg_class; /* class name: services sharing authentication */ char * pg_class; /* class name: services sharing authentication */
struct svc_stat * pg_stats; /* rpc statistics */ struct svc_stat * pg_stats; /* rpc statistics */
......
net/sunrpc/svc.c
View file @ aa8217d5
...@@ -1008,7 +1008,7 @@ int svc_register(const struct svc_serv *serv, struct net *net, ...@@ -1008,7 +1008,7 @@ int svc_register(const struct svc_serv *serv, struct net *net,
const unsigned short port) const unsigned short port)
{ {
struct svc_program *progp; struct svc_program *progp;
struct svc_version *vers; const struct svc_version *vers;
unsigned int i; unsigned int i;
int error = 0; int error = 0;
...@@ -1151,7 +1151,7 @@ static int ...@@ -1151,7 +1151,7 @@ static int
svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv) svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
{ {
struct svc_program *progp; struct svc_program *progp;
struct svc_version *versp = NULL; /* compiler food */ const struct svc_version *versp = NULL; /* compiler food */
const struct svc_procedure *procp = NULL; const struct svc_procedure *procp = NULL;
struct svc_serv *serv = rqstp->rq_server; struct svc_serv *serv = rqstp->rq_server;
__be32 *statp; __be32 *statp;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7