Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fd38af9 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

sunrpc: move pc_count out of struct svc_procinfo 



pc_count is the only writeable memeber of struct svc_procinfo, which is
a good candidate to be const-ified as it contains function pointers.

This patch moves it into out out struct svc_procinfo, and into a
separate writable array that is pointed to by struct svc_version.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent eb69853d

fs/lockd/svc.c

+6 −0
Original line number Diff line number Diff line
@@ -739,23 +739,29 @@ module_exit(exit_nlm); 
/*

 * Define NLM program and procedures

 */

static unsigned int nlmsvc_version1_count[17];

static struct svc_version	nlmsvc_version1 = {

		.vs_vers	= 1,

		.vs_nproc	= 17,

		.vs_proc	= nlmsvc_procedures,

		.vs_count	= nlmsvc_version1_count,

		.vs_xdrsize	= NLMSVC_XDRSIZE,

};

static unsigned int nlmsvc_version3_count[24];

static struct svc_version	nlmsvc_version3 = {

		.vs_vers	= 3,

		.vs_nproc	= 24,

		.vs_proc	= nlmsvc_procedures,

		.vs_count	= nlmsvc_version3_count,

		.vs_xdrsize	= NLMSVC_XDRSIZE,

};

#ifdef CONFIG_LOCKD_V4

static unsigned int nlmsvc_version4_count[24];

static struct svc_version	nlmsvc_version4 = {

		.vs_vers	= 4,

		.vs_nproc	= 24,

		.vs_proc	= nlmsvc_procedures4,

		.vs_count	= nlmsvc_version4_count,

		.vs_xdrsize	= NLMSVC_XDRSIZE,

};

#endif

fs/nfs/callback_xdr.c

+4 −0
Original line number Diff line number Diff line
@@ -1011,20 +1011,24 @@ static struct svc_procedure nfs4_callback_procedures1[] = { 
	}

};



static unsigned int nfs4_callback_count1[ARRAY_SIZE(nfs4_callback_procedures1)];

struct svc_version nfs4_callback_version1 = {

	.vs_vers = 1,

	.vs_nproc = ARRAY_SIZE(nfs4_callback_procedures1),

	.vs_proc = nfs4_callback_procedures1,

	.vs_count = nfs4_callback_count1,

	.vs_xdrsize = NFS4_CALLBACK_XDRSIZE,

	.vs_dispatch = NULL,

	.vs_hidden = true,

	.vs_need_cong_ctrl = true,

};



static unsigned int nfs4_callback_count4[ARRAY_SIZE(nfs4_callback_procedures1)];

struct svc_version nfs4_callback_version4 = {

	.vs_vers = 4,

	.vs_nproc = ARRAY_SIZE(nfs4_callback_procedures1),

	.vs_proc = nfs4_callback_procedures1,

	.vs_count = nfs4_callback_count4,

	.vs_xdrsize = NFS4_CALLBACK_XDRSIZE,

	.vs_dispatch = NULL,

	.vs_hidden = true,

fs/nfsd/nfs2acl.c

+2 −0
Original line number Diff line number Diff line
@@ -378,10 +378,12 @@ static struct svc_procedure nfsd_acl_procedures2[] = { 
  PROC(access,	access,		access,		access,   RC_NOCACHE, ST+AT+1),

};



static unsigned int nfsd_acl_count2[ARRAY_SIZE(nfsd_acl_procedures2)];

struct svc_version	nfsd_acl_version2 = {

		.vs_vers	= 2,

		.vs_nproc	= 5,

		.vs_proc	= nfsd_acl_procedures2,

		.vs_count	= nfsd_acl_count2,

		.vs_dispatch	= nfsd_dispatch,

		.vs_xdrsize	= NFS3_SVC_XDRSIZE,

};

fs/nfsd/nfs3acl.c

+2 −0
Original line number Diff line number Diff line
@@ -263,10 +263,12 @@ static struct svc_procedure nfsd_acl_procedures3[] = { 
  PROC(setacl,	setacl,		setacl,		fhandle,  RC_NOCACHE, ST+pAT),

};



static unsigned int nfsd_acl_count3[ARRAY_SIZE(nfsd_acl_procedures3)];

struct svc_version	nfsd_acl_version3 = {

		.vs_vers	= 3,

		.vs_nproc	= 3,

		.vs_proc	= nfsd_acl_procedures3,

		.vs_count	= nfsd_acl_count3,

		.vs_dispatch	= nfsd_dispatch,

		.vs_xdrsize	= NFS3_SVC_XDRSIZE,

};

fs/nfsd/nfs3proc.c

+2 −0
Original line number Diff line number Diff line
@@ -890,10 +890,12 @@ static struct svc_procedure nfsd_procedures3[22] = { 
	},

};



static unsigned int nfsd_count3[ARRAY_SIZE(nfsd_procedures3)];

struct svc_version	nfsd_version3 = {

		.vs_vers	= 3,

		.vs_nproc	= 22,

		.vs_proc	= nfsd_procedures3,

		.vs_count	= nfsd_count3,

		.vs_dispatch	= nfsd_dispatch,

		.vs_xdrsize	= NFS3_SVC_XDRSIZE,

};