Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "nfsd: rename NFSD_NET_* to NFSD_STATS_*"

Browse source 
This reverts commit 4004e4dc9d.
This commit is contained in:
Ksawlii 2024-11-24 00:23:44 +01:00
parent 7dd81aa9d2
commit 06b45d7dd6
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/nfsd/netns.h
View file

@ -25,9 +25,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_STATS_PAYLOAD_MISSES, NFSD_NET_PAYLOAD_MISSES,
/* amount of memory (in bytes) currently consumed by the DRC */ /* amount of memory (in bytes) currently consumed by the DRC */
NFSD_STATS_DRC_MEM_USAGE, NFSD_NET_DRC_MEM_USAGE,
NFSD_NET_COUNTERS_NUM NFSD_NET_COUNTERS_NUM
}; };

4
fs/nfsd/nfscache.c
View file

@ -673,7 +673,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_STATS_DRC_MEM_USAGE])); percpu_counter_sum_positive(&nn->counter[NFSD_NET_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",
@ -681,7 +681,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_STATS_PAYLOAD_MISSES])); percpu_counter_sum_positive(&nn->counter[NFSD_NET_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;

6
fs/nfsd/stats.h
View file

@ -80,17 +80,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_STATS_PAYLOAD_MISSES]); percpu_counter_inc(&nn->counter[NFSD_NET_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_STATS_DRC_MEM_USAGE], amount); percpu_counter_add(&nn->counter[NFSD_NET_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_STATS_DRC_MEM_USAGE], amount); percpu_counter_sub(&nn->counter[NFSD_NET_DRC_MEM_USAGE], amount);
} }
#endif /* _NFSD_STATS_H */ #endif /* _NFSD_STATS_H */