summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2026-01-07 10:26:54 +0300
committerAnna Schumaker <anna.schumaker@oracle.com>2026-01-20 22:49:45 +0300
commit45875b7efb8a805414fe3d74f276e5fa9cf3e34e (patch)
tree1ebfbc80ea8786e83473a65c53671bc53c704f98
parentf8abad38684c43ce00fefc6858d16034f0f359bb (diff)
downloadlinux-45875b7efb8a805414fe3d74f276e5fa9cf3e34e.tar.xz
NFS: remove nfs_client_mark_return_all_delegations
Fold nfs_client_mark_return_all_delegations into nfs_expire_all_delegations, which is the only caller. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>
-rw-r--r--fs/nfs/delegation.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
index e139cc47dda2..95f410d65e3c 100644
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
@@ -943,16 +943,6 @@ static bool nfs_server_mark_return_all_delegations(struct nfs_server *server)
return ret;
}
-static void nfs_client_mark_return_all_delegations(struct nfs_client *clp)
-{
- struct nfs_server *server;
-
- rcu_read_lock();
- list_for_each_entry_rcu(server, &clp->cl_superblocks, client_link)
- nfs_server_mark_return_all_delegations(server);
- rcu_read_unlock();
-}
-
static void nfs_delegation_run_state_manager(struct nfs_client *clp)
{
if (test_bit(NFS4CLNT_DELEGRETURN, &clp->cl_state))
@@ -966,7 +956,13 @@ static void nfs_delegation_run_state_manager(struct nfs_client *clp)
*/
void nfs_expire_all_delegations(struct nfs_client *clp)
{
- nfs_client_mark_return_all_delegations(clp);
+ struct nfs_server *server;
+
+ rcu_read_lock();
+ list_for_each_entry_rcu(server, &clp->cl_superblocks, client_link)
+ nfs_server_mark_return_all_delegations(server);
+ rcu_read_unlock();
+
nfs_delegation_run_state_manager(clp);
}