LU-6325 ptlrpc: make ptlrpcd threads cpt-aware

[fs/lustre-release.git] / lustre / ldlm / ldlm_request.c

diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c
index 833078a..d3049c0 100644 (file)
--- a/lustre/ldlm/ldlm_request.c
+++ b/lustre/ldlm/ldlm_request.c
@@ -1233,14 +1233,14 @@ int ldlm_cli_cancel_req(struct obd_export *exp, struct list_head *cancels,
 
                 ldlm_cancel_pack(req, cancels, count);
 
-                ptlrpc_request_set_replen(req);
-                if (flags & LCF_ASYNC) {
-                        ptlrpcd_add_req(req, PDL_POLICY_LOCAL, -1);
-                        sent = count;
-                        GOTO(out, 0);
-                } else {
-                        rc = ptlrpc_queue_wait(req);
-                }
+               ptlrpc_request_set_replen(req);
+               if (flags & LCF_ASYNC) {
+                       ptlrpcd_add_req(req);
+                       sent = count;
+                       GOTO(out, 0);
+               }
+
+               rc = ptlrpc_queue_wait(req);
                if (rc == LUSTRE_ESTALE) {
                         CDEBUG(D_DLMTRACE, "client/server (nid %s) "
                                "out of sync -- not fatal\n",
@@ -2271,7 +2271,7 @@ static int replay_one_lock(struct obd_import *imp, struct ldlm_lock *lock)
        aa = ptlrpc_req_async_args(req);
        aa->lock_handle = body->lock_handle[0];
        req->rq_interpret_reply = (ptlrpc_interpterer_t)replay_lock_interpret;
-       ptlrpcd_add_req(req, PDL_POLICY_LOCAL, -1);
+       ptlrpcd_add_req(req);
 
        RETURN(0);
 }