LU-1373 ptlrpc: add flow control extension to ptlrpc req set

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

diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index 29a8683..2c65a42 100644 (file)
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -677,10 +677,6 @@ static int ldlm_cb_interpret(const struct lu_env *env,
         }
         LDLM_LOCK_RELEASE(lock);
 
-        if (cfs_atomic_dec_return(&arg->rpcs) < arg->threshold)
-                cfs_waitq_signal(&arg->waitq);
-
-        ldlm_csa_put(arg);
         RETURN(0);
 }
 
@@ -689,22 +685,20 @@ static inline int ldlm_bl_and_cp_ast_tail(struct ptlrpc_request *req,
                                           struct ldlm_lock *lock,
                                           int instant_cancel)
 {
-        int rc = 0;
-        ENTRY;
-
-        if (unlikely(instant_cancel)) {
-                rc = ptl_send_rpc(req, 1);
-                ptlrpc_req_finished(req);
-                if (rc == 0)
-                        cfs_atomic_inc(&arg->restart);
-        } else {
-                LDLM_LOCK_GET(lock);
-                cfs_atomic_inc(&arg->rpcs);
-                cfs_atomic_inc(&arg->refcount);
-                ptlrpcd_add_req(req, PDL_POLICY_ROUND, -1);
-        }
+       int rc = 0;
+       ENTRY;
+
+       if (unlikely(instant_cancel)) {
+               rc = ptl_send_rpc(req, 1);
+               ptlrpc_req_finished(req);
+               if (rc == 0)
+                       cfs_atomic_inc(&arg->restart);
+       } else {
+               LDLM_LOCK_GET(lock);
+               ptlrpc_set_add_req(arg->set, req);
+       }
 
-        RETURN(rc);
+       RETURN(rc);
 }
 
 /**