From 0029fe0920c7dc0aee9bc95587158bbbe3c372d0 Mon Sep 17 00:00:00 2001 From: Arshad Hussain Date: Thu, 2 May 2024 07:21:02 -0400 Subject: [PATCH] LU-16741 ldlm: rename ptlrpc_req_finished for component ldlm Patch renames ptlrpc_req_finished to ptlrpc_req_put for ldlm component Test-Parameters: trivial Signed-off-by: Arshad Hussain Change-Id: I0daff368ed1b4448f236e7f8f17e1534b3db5e58 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/54992 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Patrick Farrell Reviewed-by: Oleg Drokin --- lustre/ldlm/ldlm_lockd.c | 6 +++--- lustre/ldlm/ldlm_request.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c index ca59464..9215f6b 100644 --- a/lustre/ldlm/ldlm_lockd.c +++ b/lustre/ldlm/ldlm_lockd.c @@ -885,7 +885,7 @@ static inline int ldlm_ast_fini(struct ptlrpc_request *req, if (unlikely(instant_cancel)) { rc = ptl_send_rpc(req, 1); - ptlrpc_req_finished(req); + ptlrpc_req_put(req); if (rc == 0) atomic_inc(&arg->restart); } else { @@ -985,7 +985,7 @@ int ldlm_server_blocking_ast(struct ldlm_lock *lock, if (ldlm_is_destroyed(lock)) { /* What's the point? */ unlock_res_and_lock(lock); - ptlrpc_req_finished(req); + ptlrpc_req_put(req); RETURN(0); } @@ -998,7 +998,7 @@ int ldlm_server_blocking_ast(struct ldlm_lock *lock, ldlm_set_waited(lock); unlock_res_and_lock(lock); - ptlrpc_req_finished(req); + ptlrpc_req_put(req); LDLM_DEBUG(lock, "lock not granted, not sending blocking AST"); RETURN(0); } diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c index 8ae1c88..4a8b942 100644 --- a/lustre/ldlm/ldlm_request.c +++ b/lustre/ldlm/ldlm_request.c @@ -1109,7 +1109,7 @@ int ldlm_cli_enqueue(struct obd_export *exp, struct ptlrpc_request **reqp, failed_lock_cleanup(ns, lock, einfo->ei_mode); LDLM_LOCK_RELEASE(lock); if (!req_passed_in) - ptlrpc_req_finished(req); + ptlrpc_req_put(req); GOTO(out, rc); } } @@ -1138,7 +1138,7 @@ int ldlm_cli_enqueue(struct obd_export *exp, struct ptlrpc_request **reqp, out: if (!req_passed_in && req != NULL) { - ptlrpc_req_finished(req); + ptlrpc_req_put(req); if (reqp) *reqp = NULL; } @@ -1461,7 +1461,7 @@ int ldlm_cli_cancel_req(struct obd_export *exp, struct ldlm_lock *lock, rc = _ldlm_cancel_pack(req, lock, head, count); if (rc == 0) { - ptlrpc_req_finished(req); + ptlrpc_req_put(req); sent = count; GOTO(out, rc); } @@ -1481,7 +1481,7 @@ int ldlm_cli_cancel_req(struct obd_export *exp, struct ldlm_lock *lock, rc = 0; } else if (rc == -ETIMEDOUT && /* check there was no reconnect*/ req->rq_import_generation == imp->imp_generation) { - ptlrpc_req_finished(req); + ptlrpc_req_put(req); continue; } else if (rc != ELDLM_OK) { /* -ESHUTDOWN is common on umount */ @@ -1494,7 +1494,7 @@ int ldlm_cli_cancel_req(struct obd_export *exp, struct ldlm_lock *lock, break; } - ptlrpc_req_finished(req); + ptlrpc_req_put(req); EXIT; out: return sent ? sent : rc; -- 1.8.3.1