From: Vitaly Fertman Date: Tue, 19 Oct 2010 23:54:17 +0000 (+0400) Subject: Revert "b=21760 Applications hung in direct I/O" X-Git-Tag: 2.0.54.0~13 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=b4c6405a8b014d064a0f67cb59599fa4ed2d6f4a Revert "b=21760 Applications hung in direct I/O" This reverts commit 75b7e5a7b448238e486b8f9bd753cda5f4b4e68b. --- diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c index ea4f2e2..06b313f 100644 --- a/lustre/ptlrpc/client.c +++ b/lustre/ptlrpc/client.c @@ -1445,12 +1445,6 @@ int ptlrpc_check_set(const struct lu_env *env, struct ptlrpc_request_set *set) LASSERT(req->rq_next_phase != req->rq_phase); LASSERT(req->rq_next_phase != RQ_PHASE_UNDEFINED); - /* Abort the bulk, if the request itself has been - * aborted, for instance, on a client eviction. */ - if (req->rq_err && req->rq_status == -EINTR && - req->rq_bulk != NULL) - ptlrpc_abort_bulk(req->rq_bulk); - /* * Skip processing until reply is unlinked. We * can't return to pool before that and we can't