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

NFSD: Add a couple more nfsd_clid_expired call sites

Browse source 
[ Upstream commit 2958d2ee71021b6c44212ec6c2a39cc71d9cd4a9 ]

Improve observation of NFSv4 lease expiry.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
[ cel: adjusted to apply to v5.10.y ]
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Chuck Lever 2021-05-14 15:56:06 -04:00 • committed by Ksawlii
parent 82c0215496
commit 0eb39833be
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fs/nfsd/nfs4state.c
View file

@ -2687,6 +2687,8 @@ static void force_expire_client(struct nfs4_client *clp)
struct nfsd_net *nn = net_generic(clp->net, nfsd_net_id); struct nfsd_net *nn = net_generic(clp->net, nfsd_net_id);
bool already_expired; bool already_expired;
trace_nfsd_clid_admin_expired(&clp->cl_clientid);
spin_lock(&nn->client_lock); spin_lock(&nn->client_lock);
clp->cl_time = 0; clp->cl_time = 0;
spin_unlock(&nn->client_lock); spin_unlock(&nn->client_lock);
@ -3233,6 +3235,7 @@ out_new:
status = mark_client_expired_locked(conf); status = mark_client_expired_locked(conf);
if (status) if (status)
goto out; goto out;
trace_nfsd_clid_replaced(&conf->cl_clientid);
} }
new->cl_minorversion = cstate->minorversion; new->cl_minorversion = cstate->minorversion;
new->cl_spo_must_allow.u.words[0] = exid->spo_must_allow[0]; new->cl_spo_must_allow.u.words[0] = exid->spo_must_allow[0];
@ -3472,6 +3475,7 @@ nfsd4_create_session(struct svc_rqst *rqstp,
old = NULL; old = NULL;
goto out_free_conn; goto out_free_conn;
} }
trace_nfsd_clid_replaced(&old->cl_clientid);
} }
move_to_confirmed(unconf); move_to_confirmed(unconf);
conf = unconf; conf = unconf;
@ -4112,6 +4116,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
old = NULL; old = NULL;
goto out; goto out;
} }
trace_nfsd_clid_replaced(&old->cl_clientid);
} }
move_to_confirmed(unconf); move_to_confirmed(unconf);
conf = unconf; conf = unconf;
@ -5550,10 +5555,8 @@ nfs4_laundromat(struct nfsd_net *nn)
clp = list_entry(pos, struct nfs4_client, cl_lru); clp = list_entry(pos, struct nfs4_client, cl_lru);
if (!state_expired(&lt, clp->cl_time)) if (!state_expired(&lt, clp->cl_time))
break; break;
if (mark_client_expired_locked(clp)) { if (mark_client_expired_locked(clp))
trace_nfsd_clid_expired(&clp->cl_clientid);
continue; continue;
}
list_add(&clp->cl_lru, &reaplist); list_add(&clp->cl_lru, &reaplist);
} }
spin_unlock(&nn->client_lock); spin_unlock(&nn->client_lock);

3
fs/nfsd/trace.h
View file

@ -514,7 +514,8 @@ DEFINE_EVENT(nfsd_clientid_class, nfsd_clid_##name, \
DEFINE_CLIENTID_EVENT(reclaim_complete); DEFINE_CLIENTID_EVENT(reclaim_complete);
DEFINE_CLIENTID_EVENT(confirmed); DEFINE_CLIENTID_EVENT(confirmed);
DEFINE_CLIENTID_EVENT(destroyed); DEFINE_CLIENTID_EVENT(destroyed);
DEFINE_CLIENTID_EVENT(expired); DEFINE_CLIENTID_EVENT(admin_expired);
DEFINE_CLIENTID_EVENT(replaced);
DEFINE_CLIENTID_EVENT(purged); DEFINE_CLIENTID_EVENT(purged);
DEFINE_CLIENTID_EVENT(renew); DEFINE_CLIENTID_EVENT(renew);
DEFINE_CLIENTID_EVENT(stale); DEFINE_CLIENTID_EVENT(stale);