From 56b204d6f054fe35915ddff877af98d7f50b07f8 Mon Sep 17 00:00:00 2001 From: Johann Lombardi Date: Fri, 8 Oct 2010 00:25:32 +0200 Subject: [PATCH] Revert "b=21760 Application hung in direct I/O" This reverts commit 91d48dd54d07c3901da34227037a32412243e08a. With this patch, ptlrpcd sleeps until bulk buffers are unlinked by the network stack. Meanwhile, no requests/replies are processed by ptlrpcd which can cause various kind of problems (e.g. eviction). --- lustre/ptlrpc/client.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c index e56933d..8ad465a 100644 --- a/lustre/ptlrpc/client.c +++ b/lustre/ptlrpc/client.c @@ -1224,12 +1224,6 @@ int ptlrpc_check_set(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 * call interpret before that. We need to make -- 1.8.3.1