Skip to content

Commit d98416c

Browse files
josefbacikchucklever
authored andcommitted
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: Josef Bacik <josef@toxicpanda.com> Reviewed-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
1 parent 418b968 commit d98416c

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

fs/nfsd/netns.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ struct nfsd4_client_tracking_ops;
2626

2727
enum {
2828
/* cache misses due only to checksum comparison failures */
29-
NFSD_NET_PAYLOAD_MISSES,
29+
NFSD_STATS_PAYLOAD_MISSES,
3030
/* amount of memory (in bytes) currently consumed by the DRC */
31-
NFSD_NET_DRC_MEM_USAGE,
31+
NFSD_STATS_DRC_MEM_USAGE,
3232
NFSD_NET_COUNTERS_NUM
3333
};
3434

fs/nfsd/nfscache.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -687,15 +687,15 @@ int nfsd_reply_cache_stats_show(struct seq_file *m, void *v)
687687
atomic_read(&nn->num_drc_entries));
688688
seq_printf(m, "hash buckets: %u\n", 1 << nn->maskbits);
689689
seq_printf(m, "mem usage: %lld\n",
690-
percpu_counter_sum_positive(&nn->counter[NFSD_NET_DRC_MEM_USAGE]));
690+
percpu_counter_sum_positive(&nn->counter[NFSD_STATS_DRC_MEM_USAGE]));
691691
seq_printf(m, "cache hits: %lld\n",
692692
percpu_counter_sum_positive(&nfsdstats.counter[NFSD_STATS_RC_HITS]));
693693
seq_printf(m, "cache misses: %lld\n",
694694
percpu_counter_sum_positive(&nfsdstats.counter[NFSD_STATS_RC_MISSES]));
695695
seq_printf(m, "not cached: %lld\n",
696696
percpu_counter_sum_positive(&nfsdstats.counter[NFSD_STATS_RC_NOCACHE]));
697697
seq_printf(m, "payload misses: %lld\n",
698-
percpu_counter_sum_positive(&nn->counter[NFSD_NET_PAYLOAD_MISSES]));
698+
percpu_counter_sum_positive(&nn->counter[NFSD_STATS_PAYLOAD_MISSES]));
699699
seq_printf(m, "longest chain len: %u\n", nn->longest_chain);
700700
seq_printf(m, "cachesize at longest: %u\n", nn->longest_chain_cachesize);
701701
return 0;

fs/nfsd/stats.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,17 @@ static inline void nfsd_stats_io_write_add(struct svc_export *exp, s64 amount)
8181

8282
static inline void nfsd_stats_payload_misses_inc(struct nfsd_net *nn)
8383
{
84-
percpu_counter_inc(&nn->counter[NFSD_NET_PAYLOAD_MISSES]);
84+
percpu_counter_inc(&nn->counter[NFSD_STATS_PAYLOAD_MISSES]);
8585
}
8686

8787
static inline void nfsd_stats_drc_mem_usage_add(struct nfsd_net *nn, s64 amount)
8888
{
89-
percpu_counter_add(&nn->counter[NFSD_NET_DRC_MEM_USAGE], amount);
89+
percpu_counter_add(&nn->counter[NFSD_STATS_DRC_MEM_USAGE], amount);
9090
}
9191

9292
static inline void nfsd_stats_drc_mem_usage_sub(struct nfsd_net *nn, s64 amount)
9393
{
94-
percpu_counter_sub(&nn->counter[NFSD_NET_DRC_MEM_USAGE], amount);
94+
percpu_counter_sub(&nn->counter[NFSD_STATS_DRC_MEM_USAGE], amount);
9595
}
9696

9797
#ifdef CONFIG_NFSD_V4

0 commit comments

Comments
 (0)