nfsd: stop setting ->pg_stats for unused stats

[ Upstream commit a2214ed588fb3c5b9824a21cff870482510372bb ]

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: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 5579e67da17dbf4cabdfa11dd655915fd89438c2..c33f78513f00f56e089768f82d056a5b4d819a19 100644 (file)
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -759,8 +759,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 */
@@ -768,7 +766,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,

diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index 8fe143cad4a2bb442a1f1b8cea6d52ed64bd140a..f00fff3633f60ed14662dcc0769f53713d676c66 100644 (file)
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -407,15 +407,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,

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 3fdff9a3b18243195f9e628f7941371b070da3f7..2a11804b0e45b52eb5c728fdce1f09a4f58e55cd 100644 (file)
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -89,7 +89,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,
@@ -108,15 +107,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[] = {