r=shadow,vitaly
- check rq_phase correctly in ptlrpc_expired_set() and couple of other places.
list_entry(tmp, struct ptlrpc_request, rq_set_chain);
/* Request in-flight? */
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;
!req->rq_waiting && !req->rq_resend) ||
(req->rq_phase == RQ_PHASE_BULK)))
continue;
/*
* Request in-flight?
*/
/*
* 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;
/*
(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)
* Already timed out.
*/
if (req->rq_timedout)
- 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;
(req->rq_phase == RQ_PHASE_NEW)))
return 0;