From 361c006488c9191f7281c29a7dd170d9a66754aa Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 25 May 2004 09:10:38 +0000 Subject: [PATCH] b=3063 --- lustre/ptlrpc/client.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c index 0774fa2..04ff0e9 100644 --- a/lustre/ptlrpc/client.c +++ b/lustre/ptlrpc/client.c @@ -646,13 +646,9 @@ int ptlrpc_check_set(struct ptlrpc_request_set *set) if (req->rq_waiting || req->rq_resend) { int status; - LASSERT (!ptlrpc_client_receiving_reply(req)); - LASSERT (req->rq_bulk == NULL || - !ptlrpc_bulk_active(req->rq_bulk)); - spin_lock_irqsave(&imp->imp_lock, flags); - if (ptlrpc_import_delay_req(imp, req, &status)) { + if (ptlrpc_import_delay_req(imp, req, &status)){ spin_unlock_irqrestore(&imp->imp_lock, flags); continue; @@ -686,6 +682,8 @@ int ptlrpc_check_set(struct ptlrpc_request_set *set) if (req->rq_bulk) { __u64 old_xid = req->rq_xid; + ptlrpc_unregister_bulk (req); + /* ensure previous bulk fails */ req->rq_xid = ptlrpc_next_xid(); CDEBUG(D_HA, "resend bulk " -- 1.8.3.1