diff options
| author | Jeff Layton <jlayton@kernel.org> | 2025-02-20 11:47:14 -0500 |
|---|---|---|
| committer | Chuck Lever <chuck.lever@oracle.com> | 2025-03-10 09:11:09 -0400 |
| commit | 424dd3df1f991b14a70f044a68c8a595abbdf1ad (patch) | |
| tree | aaf860698cfb4a42a9a3f92d81f996977fd34493 /fs/nfsd/state.h | |
| parent | 1054e8ffc5c492f341bdf1888b882f1d163dd3d8 (diff) | |
nfsd: eliminate cl_ra_cblist and NFSD4_CLIENT_CB_RECALL_ANY
deleg_reaper() will walk the client_lru list and put any suitable
entries onto "cblist" using the cl_ra_cblist pointer. It then walks the
objects outside the spinlock and queues callbacks for them.
None of the operations that deleg_reaper() does outside the
nn->client_lock are blocking operations. Just queue their workqueue jobs
under the nn->client_lock instead.
Also, the NFSD4_CLIENT_CB_RECALL_ANY and NFSD4_CALLBACK_RUNNING flags
serve an identical purpose now. Drop the NFSD4_CLIENT_CB_RECALL_ANY flag
and just use the one in the callback.
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Diffstat (limited to 'fs/nfsd/state.h')
| -rw-r--r-- | fs/nfsd/state.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index a7cc3b9cdf31..b1907979524c 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -454,7 +454,6 @@ struct nfs4_client { #define NFSD4_CLIENT_UPCALL_LOCK (5) /* upcall serialization */ #define NFSD4_CLIENT_CB_FLAG_MASK (1 << NFSD4_CLIENT_CB_UPDATE | \ 1 << NFSD4_CLIENT_CB_KILL) -#define NFSD4_CLIENT_CB_RECALL_ANY (6) unsigned long cl_flags; struct workqueue_struct *cl_callback_wq; @@ -500,7 +499,6 @@ struct nfs4_client { struct nfsd4_cb_recall_any *cl_ra; time64_t cl_ra_time; - struct list_head cl_ra_cblist; }; /* struct nfs4_client_reset |