Commit d98416cc authored by Josef Bacik's avatar Josef Bacik Committed by Chuck Lever

nfsd: rename NFSD_NET_* to NFSD_STATS_*

We're going to merge the stats all into per network namespace in
subsequent patches, rename these nn counters to be consistent with the
rest of the stats.
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 418b9687
...@@ -26,9 +26,9 @@ struct nfsd4_client_tracking_ops; ...@@ -26,9 +26,9 @@ struct nfsd4_client_tracking_ops;
enum { enum {
/* cache misses due only to checksum comparison failures */ /* cache misses due only to checksum comparison failures */
NFSD_NET_PAYLOAD_MISSES, NFSD_STATS_PAYLOAD_MISSES,
/* amount of memory (in bytes) currently consumed by the DRC */ /* amount of memory (in bytes) currently consumed by the DRC */
NFSD_NET_DRC_MEM_USAGE, NFSD_STATS_DRC_MEM_USAGE,
NFSD_NET_COUNTERS_NUM NFSD_NET_COUNTERS_NUM
}; };
......
...@@ -687,7 +687,7 @@ int nfsd_reply_cache_stats_show(struct seq_file *m, void *v) ...@@ -687,7 +687,7 @@ int nfsd_reply_cache_stats_show(struct seq_file *m, void *v)
atomic_read(&nn->num_drc_entries)); atomic_read(&nn->num_drc_entries));
seq_printf(m, "hash buckets: %u\n", 1 << nn->maskbits); seq_printf(m, "hash buckets: %u\n", 1 << nn->maskbits);
seq_printf(m, "mem usage: %lld\n", seq_printf(m, "mem usage: %lld\n",
percpu_counter_sum_positive(&nn->counter[NFSD_NET_DRC_MEM_USAGE])); percpu_counter_sum_positive(&nn->counter[NFSD_STATS_DRC_MEM_USAGE]));
seq_printf(m, "cache hits: %lld\n", seq_printf(m, "cache hits: %lld\n",
percpu_counter_sum_positive(&nfsdstats.counter[NFSD_STATS_RC_HITS])); percpu_counter_sum_positive(&nfsdstats.counter[NFSD_STATS_RC_HITS]));
seq_printf(m, "cache misses: %lld\n", seq_printf(m, "cache misses: %lld\n",
...@@ -695,7 +695,7 @@ int nfsd_reply_cache_stats_show(struct seq_file *m, void *v) ...@@ -695,7 +695,7 @@ int nfsd_reply_cache_stats_show(struct seq_file *m, void *v)
seq_printf(m, "not cached: %lld\n", seq_printf(m, "not cached: %lld\n",
percpu_counter_sum_positive(&nfsdstats.counter[NFSD_STATS_RC_NOCACHE])); percpu_counter_sum_positive(&nfsdstats.counter[NFSD_STATS_RC_NOCACHE]));
seq_printf(m, "payload misses: %lld\n", seq_printf(m, "payload misses: %lld\n",
percpu_counter_sum_positive(&nn->counter[NFSD_NET_PAYLOAD_MISSES])); percpu_counter_sum_positive(&nn->counter[NFSD_STATS_PAYLOAD_MISSES]));
seq_printf(m, "longest chain len: %u\n", nn->longest_chain); seq_printf(m, "longest chain len: %u\n", nn->longest_chain);
seq_printf(m, "cachesize at longest: %u\n", nn->longest_chain_cachesize); seq_printf(m, "cachesize at longest: %u\n", nn->longest_chain_cachesize);
return 0; return 0;
......
...@@ -81,17 +81,17 @@ static inline void nfsd_stats_io_write_add(struct svc_export *exp, s64 amount) ...@@ -81,17 +81,17 @@ static inline void nfsd_stats_io_write_add(struct svc_export *exp, s64 amount)
static inline void nfsd_stats_payload_misses_inc(struct nfsd_net *nn) static inline void nfsd_stats_payload_misses_inc(struct nfsd_net *nn)
{ {
percpu_counter_inc(&nn->counter[NFSD_NET_PAYLOAD_MISSES]); percpu_counter_inc(&nn->counter[NFSD_STATS_PAYLOAD_MISSES]);
} }
static inline void nfsd_stats_drc_mem_usage_add(struct nfsd_net *nn, s64 amount) static inline void nfsd_stats_drc_mem_usage_add(struct nfsd_net *nn, s64 amount)
{ {
percpu_counter_add(&nn->counter[NFSD_NET_DRC_MEM_USAGE], amount); percpu_counter_add(&nn->counter[NFSD_STATS_DRC_MEM_USAGE], amount);
} }
static inline void nfsd_stats_drc_mem_usage_sub(struct nfsd_net *nn, s64 amount) static inline void nfsd_stats_drc_mem_usage_sub(struct nfsd_net *nn, s64 amount)
{ {
percpu_counter_sub(&nn->counter[NFSD_NET_DRC_MEM_USAGE], amount); percpu_counter_sub(&nn->counter[NFSD_STATS_DRC_MEM_USAGE], amount);
} }
#ifdef CONFIG_NFSD_V4 #ifdef CONFIG_NFSD_V4
......
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