From c584acbe91fcbf6f937e9555b7101e576069822b Mon Sep 17 00:00:00 2001
From: yury <yury>
Date: Wed, 12 Nov 2008 18:43:33 +0000
Subject: [PATCH] b=17310 r=shadow,vitaly - correct check for phase in
ptlrpc_expired_set() and couple of other places.
---
lustre/ptlrpc/client.c | 17 +++--------------
lustre/ptlrpc/import.c | 5 ++---
2 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index b0565dbd07..528cf937b9 100644
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -1372,10 +1372,8 @@ 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) &&
- !req->rq_waiting && !req->rq_resend) ||
- (req->rq_phase == RQ_PHASE_BULK)))
+ if (!((req->rq_phase == RQ_PHASE_RPC && !req->rq_waiting &&
+ !req->rq_resend) || (req->rq_phase == RQ_PHASE_BULK)))
continue;
if (req->rq_timedout || /* already dealt with */
@@ -1436,20 +1434,11 @@ int ptlrpc_set_next_timeout(struct ptlrpc_request_set *set)
req = list_entry(tmp, struct ptlrpc_request, rq_set_chain);
/* 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)
continue;
diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index 5a635bcb59..2745606fa6 100644
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -204,9 +204,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;
--
GitLab