From 3b511b695550d70992924967b7552ef94f699667 Mon Sep 17 00:00:00 2001 From: yury Date: Wed, 12 Nov 2008 19:16:04 +0000 Subject: [PATCH] b=17310 r=shadow,vitaly - correct check for phase in ptlrpc_expired_set() and couple of other places. --- lustre/ptlrpc/import.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c index c7913d1..9b7df0c 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; -- 1.8.3.1