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

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

fs/lockd/svc.c

+19 −19
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ module_exit(exit_nlm); 
 * Define NLM program and procedures

 */

static unsigned int nlmsvc_version1_count[17];

static struct svc_version	nlmsvc_version1 = {

static const struct svc_version	nlmsvc_version1 = {

	.vs_vers	= 1,

	.vs_nproc	= 17,

	.vs_proc	= nlmsvc_procedures,
@@ -748,7 +748,7 @@ static struct svc_version nlmsvc_version1 = { 
	.vs_xdrsize	= NLMSVC_XDRSIZE,

};

static unsigned int nlmsvc_version3_count[24];

static struct svc_version	nlmsvc_version3 = {

static const struct svc_version	nlmsvc_version3 = {

	.vs_vers	= 3,

	.vs_nproc	= 24,

	.vs_proc	= nlmsvc_procedures,
@@ -757,7 +757,7 @@ static struct svc_version nlmsvc_version3 = { 
};

#ifdef CONFIG_LOCKD_V4

static unsigned int nlmsvc_version4_count[24];

static struct svc_version	nlmsvc_version4 = {

static const struct svc_version	nlmsvc_version4 = {

	.vs_vers	= 4,

	.vs_nproc	= 24,

	.vs_proc	= nlmsvc_procedures4,
@@ -765,7 +765,7 @@ static struct svc_version nlmsvc_version4 = { 
	.vs_xdrsize	= NLMSVC_XDRSIZE,

};

#endif

static struct svc_version *	nlmsvc_version[] = {

static const struct svc_version *nlmsvc_version[] = {

	[1] = &nlmsvc_version1,

	[3] = &nlmsvc_version3,

#ifdef CONFIG_LOCKD_V4

fs/nfs/callback.c

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ static int nfs_callback_authenticate(struct svc_rqst *rqstp) 
/*

 * Define NFS4 callback program

 */

static struct svc_version *nfs4_callback_version[] = {

static const struct svc_version *nfs4_callback_version[] = {

	[1] = &nfs4_callback_version1,

	[4] = &nfs4_callback_version4,

};

fs/nfs/callback_xdr.c

+2 −2
Original line number Diff line number Diff line
@@ -1012,7 +1012,7 @@ static const struct svc_procedure 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_nproc = ARRAY_SIZE(nfs4_callback_procedures1),

	.vs_proc = nfs4_callback_procedures1,
@@ -1024,7 +1024,7 @@ struct svc_version nfs4_callback_version1 = { 
};



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_nproc = ARRAY_SIZE(nfs4_callback_procedures1),

	.vs_proc = nfs4_callback_procedures1,

fs/nfs/internal.h

+2 −2
Original line number Diff line number Diff line
@@ -225,8 +225,8 @@ static inline void nfs_fs_proc_exit(void) 
#endif



/* callback_xdr.c */

extern struct svc_version nfs4_callback_version1;

extern struct svc_version nfs4_callback_version4;

extern const struct svc_version nfs4_callback_version1;

extern const struct svc_version nfs4_callback_version4;



struct nfs_pageio_descriptor;

/* pagelist.c */

fs/nfs/nfs4_fs.h

+2 −2
Original line number Diff line number Diff line
@@ -498,8 +498,8 @@ extern const struct rpc_procinfo nfs4_procedures[]; 
struct nfs4_mount_data;



/* callback_xdr.c */

extern struct svc_version nfs4_callback_version1;

extern struct svc_version nfs4_callback_version4;

extern const struct svc_version nfs4_callback_version1;

extern const struct svc_version nfs4_callback_version4;



static inline void nfs4_stateid_copy(nfs4_stateid *dst, const nfs4_stateid *src)

{