Commit a2214ed5 authored by Josef Bacik's avatar Josef Bacik Committed by Chuck Lever
Browse files

nfsd: stop setting ->pg_stats for unused stats 



A lot of places are setting a blank svc_stats in ->pg_stats and never
utilizing these stats.  Remove all of these extra structs as we're not
reporting these stats anywhere.

Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent ab42f4d9

fs/lockd/svc.c

+0 −3
Original line number Diff line number Diff line
@@ -710,8 +710,6 @@ static const struct svc_version *nlmsvc_version[] = { 
#endif

};



static struct svc_stat		nlmsvc_stats;



#define NLM_NRVERS	ARRAY_SIZE(nlmsvc_version)

static struct svc_program	nlmsvc_program = {

	.pg_prog		= NLM_PROGRAM,		/* program number */
@@ -719,7 +717,6 @@ static struct svc_program nlmsvc_program = { 
	.pg_vers		= nlmsvc_version,	/* version table */

	.pg_name		= "lockd",		/* service name */

	.pg_class		= "nfsd",		/* share authentication with nfsd */

	.pg_stats		= &nlmsvc_stats,	/* stats table */

	.pg_authenticate	= &lockd_authenticate,	/* export authentication */

	.pg_init_request	= svc_generic_init_request,

	.pg_rpcbind_set		= svc_generic_rpcbind_set,

fs/nfs/callback.c

+0 −3
Original line number Diff line number Diff line
@@ -356,15 +356,12 @@ static const struct svc_version *nfs4_callback_version[] = { 
	[4] = &nfs4_callback_version4,

};



static struct svc_stat nfs4_callback_stats;



static struct svc_program nfs4_callback_program = {

	.pg_prog = NFS4_CALLBACK,			/* RPC service number */

	.pg_nvers = ARRAY_SIZE(nfs4_callback_version),	/* Number of entries */

	.pg_vers = nfs4_callback_version,		/* version table */

	.pg_name = "NFSv4 callback",			/* service name */

	.pg_class = "nfs",				/* authentication class */

	.pg_stats = &nfs4_callback_stats,

	.pg_authenticate = nfs_callback_authenticate,

	.pg_init_request = svc_generic_init_request,

	.pg_rpcbind_set	= svc_generic_rpcbind_set,

fs/nfsd/nfssvc.c

+0 −5
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ unsigned long nfsd_drc_max_mem; 
unsigned long	nfsd_drc_mem_used;



#if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL)

static struct svc_stat	nfsd_acl_svcstats;

static const struct svc_version *nfsd_acl_version[] = {

# if defined(CONFIG_NFSD_V2_ACL)

	[2] = &nfsd_acl_version2,
@@ -99,15 +98,11 @@ static struct svc_program nfsd_acl_program = { 
	.pg_vers		= nfsd_acl_version,

	.pg_name		= "nfsacl",

	.pg_class		= "nfsd",

	.pg_stats		= &nfsd_acl_svcstats,

	.pg_authenticate	= &svc_set_client,

	.pg_init_request	= nfsd_acl_init_request,

	.pg_rpcbind_set		= nfsd_acl_rpcbind_set,

};



static struct svc_stat	nfsd_acl_svcstats = {

	.program	= &nfsd_acl_program,

};

#endif /* defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) */



static const struct svc_version *nfsd_version[] = {