android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Merge 751777a79a ("nfsd: make svc_stat per-network namespace instead of global") into android12-5.10-lts"

Browse Source 
This reverts commit 44e9ffcf8f27f726358477ec3a99826d583922cc, reversing
changes made to b22678f8ef.

Merge "around" the nfsd changes that are in 5.10.226

Change-Id: If3a05a4f399bca9983f2ee2433ed44037e6d050b
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2024-09-13 05:21:58 +00:00
parent c3e9a280ba
commit 70fe52b634
5 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/lockd/svc.c
View File

@ -803,6 +803,8 @@ static const struct svc_version *nlmsvc_version[] = {
#endif #endif
}; };
static struct svc_stat nlmsvc_stats;
#define NLM_NRVERS ARRAY_SIZE(nlmsvc_version) #define NLM_NRVERS ARRAY_SIZE(nlmsvc_version)
static struct svc_program nlmsvc_program = { static struct svc_program nlmsvc_program = {
.pg_prog = NLM_PROGRAM, /* program number */ .pg_prog = NLM_PROGRAM, /* program number */
@ -810,6 +812,7 @@ static struct svc_program nlmsvc_program = {
.pg_vers = nlmsvc_version, /* version table */ .pg_vers = nlmsvc_version, /* version table */
.pg_name = "lockd", /* service name */ .pg_name = "lockd", /* service name */
.pg_class = "nfsd", /* share authentication with nfsd */ .pg_class = "nfsd", /* share authentication with nfsd */
.pg_stats = &nlmsvc_stats, /* stats table */
.pg_authenticate = &lockd_authenticate, /* export authentication */ .pg_authenticate = &lockd_authenticate, /* export authentication */
.pg_init_request = svc_generic_init_request, .pg_init_request = svc_generic_init_request,
.pg_rpcbind_set = svc_generic_rpcbind_set, .pg_rpcbind_set = svc_generic_rpcbind_set,

3
fs/nfs/callback.c
View File

@ -450,12 +450,15 @@ static const struct svc_version *nfs4_callback_version[] = {
[4] = &nfs4_callback_version4, [4] = &nfs4_callback_version4,
}; };
static struct svc_stat nfs4_callback_stats;
static struct svc_program nfs4_callback_program = { static struct svc_program nfs4_callback_program = {
.pg_prog = NFS4_CALLBACK, /* RPC service number */ .pg_prog = NFS4_CALLBACK, /* RPC service number */
.pg_nvers = ARRAY_SIZE(nfs4_callback_version), /* Number of entries */ .pg_nvers = ARRAY_SIZE(nfs4_callback_version), /* Number of entries */
.pg_vers = nfs4_callback_version, /* version table */ .pg_vers = nfs4_callback_version, /* version table */
.pg_name = "NFSv4 callback", /* service name */ .pg_name = "NFSv4 callback", /* service name */
.pg_class = "nfs", /* authentication class */ .pg_class = "nfs", /* authentication class */
.pg_stats = &nfs4_callback_stats,
.pg_authenticate = nfs_callback_authenticate, .pg_authenticate = nfs_callback_authenticate,
.pg_init_request = svc_generic_init_request, .pg_init_request = svc_generic_init_request,
.pg_rpcbind_set = svc_generic_rpcbind_set, .pg_rpcbind_set = svc_generic_rpcbind_set,

1
fs/nfsd/nfsd.h
View File

@ -70,7 +70,6 @@ extern struct mutex nfsd_mutex;
extern spinlock_t nfsd_drc_lock; extern spinlock_t nfsd_drc_lock;
extern unsigned long nfsd_drc_max_mem; extern unsigned long nfsd_drc_max_mem;
extern unsigned long nfsd_drc_mem_used; extern unsigned long nfsd_drc_mem_used;
extern atomic_t nfsd_th_cnt; /* number of available threads */
extern const struct seq_operations nfs_exports_op; extern const struct seq_operations nfs_exports_op;

22
fs/nfsd/trace.h
View File

@ -595,28 +595,6 @@ TRACE_EVENT(nfsd_drc_mismatch,
__entry->ingress) __entry->ingress)
); );
TRACE_EVENT_CONDITION(nfsd_drc_gc,
TP_PROTO(
const struct nfsd_net *nn,
unsigned long freed
),
TP_ARGS(nn, freed),
TP_CONDITION(freed > 0),
TP_STRUCT__entry(
__field(unsigned long long, boot_time)
__field(unsigned long, freed)
__field(int, total)
),
TP_fast_assign(
__entry->boot_time = nn->boot_time;
__entry->freed = freed;
__entry->total = atomic_read(&nn->num_drc_entries);
),
TP_printk("boot_time=%16llx total=%d freed=%lu",
__entry->boot_time, __entry->total, __entry->freed
)
);
TRACE_EVENT(nfsd_cb_args, TRACE_EVENT(nfsd_cb_args,
TP_PROTO( TP_PROTO(
const struct nfs4_client *clp, const struct nfs4_client *clp,

2
net/sunrpc/stats.c
View File

@ -309,7 +309,7 @@ EXPORT_SYMBOL_GPL(rpc_proc_unregister);
struct proc_dir_entry * struct proc_dir_entry *
svc_proc_register(struct net *net, struct svc_stat *statp, const struct proc_ops *proc_ops) svc_proc_register(struct net *net, struct svc_stat *statp, const struct proc_ops *proc_ops)
{ {
return do_register(net, statp->program->pg_name, net, proc_ops); return do_register(net, statp->program->pg_name, statp, proc_ops);
} }
EXPORT_SYMBOL_GPL(svc_proc_register); EXPORT_SYMBOL_GPL(svc_proc_register);