b=17310

r=shadow,vitaly

- check rq_phase correctly in ptlrpc_expired_set() and couple of other places.

diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index cbfcc5b..165dd29 100644 (file)
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -1521,8 +1521,7 @@ int ptlrpc_expired_set(void *data)
                         list_entry(tmp, struct ptlrpc_request, rq_set_chain);
 
                 /* Request in-flight? */
-                if (!((req->rq_phase & 
-                       (RQ_PHASE_RPC | RQ_PHASE_UNREGISTERING) &&
+                if (!((req->rq_phase == RQ_PHASE_RPC &&
                        !req->rq_waiting && !req->rq_resend) ||
                       (req->rq_phase == RQ_PHASE_BULK)))
                         continue;
@@ -1591,23 +1590,12 @@ int ptlrpc_set_next_timeout(struct ptlrpc_request_set *set)
                 /* 
                  * Request in-flight? 
                  */
-                if (!(((req->rq_phase & 
-                        (RQ_PHASE_RPC | RQ_PHASE_UNREGISTERING)) && 
-                       !req->rq_waiting) ||
+                if (!(((req->rq_phase == RQ_PHASE_RPC) && !req->rq_waiting) ||
                       (req->rq_phase == RQ_PHASE_BULK) ||
                       (req->rq_phase == RQ_PHASE_NEW)))
                         continue;
 
                 /* 
-                 * Check those waiting for long reply unlink every one 
-                 * second. 
-                 */
-                if (req->rq_phase == RQ_PHASE_UNREGISTERING) {
-                        timeout = 1;
-                        break;
-                }
-
-                /* 
                  * Already timed out. 
                  */
                 if (req->rq_timedout)

diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index 4ffa92c..80e0aaf 100644 (file)
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -212,9 +212,8 @@ ptlrpc_inflight_deadline(struct ptlrpc_request *req, time_t now)
 {
         long dl;
 
-        if (!(((req->rq_phase & (RQ_PHASE_RPC | RQ_PHASE_UNREGISTERING)) && 
-              !req->rq_waiting) ||
-              (req->rq_phase == RQ_PHASE_BULK) ||
+        if (!(((req->rq_phase == RQ_PHASE_RPC) && !req->rq_waiting) ||
+              (req->rq_phase == RQ_PHASE_BULK) || 
               (req->rq_phase == RQ_PHASE_NEW)))
                 return 0;