branch: HEAD

[fs/lustre-release.git] / lustre / ptlrpc / client.c

diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index 49694a1..0913e85 100644 (file)
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -1307,6 +1307,7 @@ int ptlrpc_check_set(const struct lu_env *env, struct ptlrpc_request_set *set)
                                 if (status) {
                                         if (req->rq_err) {
                                                 req->rq_status = status;
+                                                req->rq_wait_ctx = 0;
                                                 force_timer_recalc = 1;
                                         } else {
                                                 req->rq_wait_ctx = 1;
@@ -1529,6 +1530,10 @@ int ptlrpc_expired_set(void *data)
                 struct ptlrpc_request *req =
                         list_entry(tmp, struct ptlrpc_request, rq_set_chain);
 
+                /* don't expire request waiting for context */
+                if (req->rq_wait_ctx)
+                        continue;
+
                 /* Request in-flight? */
                 if (!((req->rq_phase == RQ_PHASE_RPC &&
                        !req->rq_waiting && !req->rq_resend) ||
@@ -2181,9 +2186,11 @@ restart:
                          */
                         spin_lock(&imp->imp_lock);
                         list_del_init(&req->rq_list);
+                        atomic_dec(&imp->imp_inflight);
                         spin_unlock(&imp->imp_lock);
 
-                        CERROR("Failed to refresh ctx of req %p: %d\n", req, rc);
+                        CERROR("Failed to refresh ctx of req %p: %d\n",
+                               req, rc);
                         GOTO(out, rc);
                 }
                 /* simulating we got error during send rpc */