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

Revert "nfsd: expose /proc/net/sunrpc/nfsd in net namespaces"

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

8
fs/nfsd/nfsctl.c
View file

@ -1466,7 +1466,6 @@ static __net_init int nfsd_init_net(struct net *net)
nfsd4_init_leases_net(nn); nfsd4_init_leases_net(nn);
get_random_bytes(&nn->siphash_key, sizeof(nn->siphash_key)); get_random_bytes(&nn->siphash_key, sizeof(nn->siphash_key));
seqlock_init(&nn->writeverf_lock); seqlock_init(&nn->writeverf_lock);
nfsd_proc_stat_init(net);
return 0; return 0;
@ -1482,7 +1481,6 @@ static __net_exit void nfsd_exit_net(struct net *net)
{ {
struct nfsd_net *nn = net_generic(net, nfsd_net_id); struct nfsd_net *nn = net_generic(net, nfsd_net_id);
nfsd_proc_stat_shutdown(net);
nfsd_net_reply_cache_destroy(nn); nfsd_net_reply_cache_destroy(nn);
nfsd_idmap_shutdown(net); nfsd_idmap_shutdown(net);
nfsd_export_shutdown(net); nfsd_export_shutdown(net);
@ -1506,7 +1504,7 @@ static int __init init_nfsd(void)
retval = nfsd4_init_pnfs(); retval = nfsd4_init_pnfs();
if (retval) if (retval)
goto out_free_slabs; goto out_free_slabs;
retval = nfsd_stat_counters_init(); /* Statistics */ retval = nfsd_stat_init(); /* Statistics */
if (retval) if (retval)
goto out_free_pnfs; goto out_free_pnfs;
retval = nfsd_drc_slab_create(); retval = nfsd_drc_slab_create();
@ -1542,7 +1540,7 @@ out_free_lockd:
nfsd_lockd_shutdown(); nfsd_lockd_shutdown();
nfsd_drc_slab_free(); nfsd_drc_slab_free();
out_free_stat: out_free_stat:
nfsd_stat_counters_destroy(); nfsd_stat_shutdown();
out_free_pnfs: out_free_pnfs:
nfsd4_exit_pnfs(); nfsd4_exit_pnfs();
out_free_slabs: out_free_slabs:
@ -1559,7 +1557,7 @@ static void __exit exit_nfsd(void)
nfsd_drc_slab_free(); nfsd_drc_slab_free();
remove_proc_entry("fs/nfs/exports", NULL); remove_proc_entry("fs/nfs/exports", NULL);
remove_proc_entry("fs/nfs", NULL); remove_proc_entry("fs/nfs", NULL);
nfsd_stat_counters_destroy(); nfsd_stat_shutdown();
nfsd_lockd_shutdown(); nfsd_lockd_shutdown();
nfsd4_free_slabs(); nfsd4_free_slabs();
nfsd4_exit_pnfs(); nfsd4_exit_pnfs();

21
fs/nfsd/stats.c
View file

@ -106,22 +106,31 @@ void nfsd_percpu_counters_destroy(struct percpu_counter counters[], int num)
percpu_counter_destroy(&counters[i]); percpu_counter_destroy(&counters[i]);
} }
int nfsd_stat_counters_init(void) static int nfsd_stat_counters_init(void)
{ {
return nfsd_percpu_counters_init(nfsdstats.counter, NFSD_STATS_COUNTERS_NUM); return nfsd_percpu_counters_init(nfsdstats.counter, NFSD_STATS_COUNTERS_NUM);
} }
void nfsd_stat_counters_destroy(void) static void nfsd_stat_counters_destroy(void)
{ {
nfsd_percpu_counters_destroy(nfsdstats.counter, NFSD_STATS_COUNTERS_NUM); nfsd_percpu_counters_destroy(nfsdstats.counter, NFSD_STATS_COUNTERS_NUM);
} }
void nfsd_proc_stat_init(struct net *net) int nfsd_stat_init(void)
{ {
svc_proc_register(net, &nfsd_svcstats, &nfsd_proc_ops); int err;
err = nfsd_stat_counters_init();
if (err)
return err;
svc_proc_register(&init_net, &nfsd_svcstats, &nfsd_proc_ops);
return 0;
} }
void nfsd_proc_stat_shutdown(struct net *net) void nfsd_stat_shutdown(void)
{ {
svc_proc_unregister(net, "nfsd"); nfsd_stat_counters_destroy();
svc_proc_unregister(&init_net, "nfsd");
} }

6
fs/nfsd/stats.h
View file

@ -39,10 +39,8 @@ extern struct svc_stat nfsd_svcstats;
int nfsd_percpu_counters_init(struct percpu_counter *counters, int num); int nfsd_percpu_counters_init(struct percpu_counter *counters, int num);
void nfsd_percpu_counters_reset(struct percpu_counter *counters, int num); void nfsd_percpu_counters_reset(struct percpu_counter *counters, int num);
void nfsd_percpu_counters_destroy(struct percpu_counter *counters, int num); void nfsd_percpu_counters_destroy(struct percpu_counter *counters, int num);
int nfsd_stat_counters_init(void); int nfsd_stat_init(void);
void nfsd_stat_counters_destroy(void); void nfsd_stat_shutdown(void);
void nfsd_proc_stat_init(struct net *net);
void nfsd_proc_stat_shutdown(struct net *net);
static inline void nfsd_stats_rc_hits_inc(void) static inline void nfsd_stats_rc_hits_inc(void)
{ {