From 5c9168c0f999a8f577fb53139546211be36bdbe1 Mon Sep 17 00:00:00 2001
From: ericm <ericm>
Date: Wed, 25 Jun 2008 17:59:23 +0000
Subject: [PATCH] branch: b1_6 drop request with 0 timeout estimation. b=14071
 r=nathan r=robert

---
 lustre/ptlrpc/service.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c
index cc54a41..276689b 100644
--- a/lustre/ptlrpc/service.c
+++ b/lustre/ptlrpc/service.c
@@ -935,8 +935,11 @@ ptlrpc_server_handle_req_in(struct ptlrpc_service *svc)
                     MSGHDR_AT_SUPPORT) ? 
                    /* The max time the client expects us to take */
                    lustre_msg_get_timeout(req->rq_reqmsg) : obd_timeout;
-        LASSERT(deadline > 0);
         req->rq_deadline = req->rq_arrival_time.tv_sec + deadline;
+        if (unlikely(deadline == 0)) {
+                DEBUG_REQ(D_ERROR, req, "Dropping request with 0 timeout");
+                goto err_req;
+        }
         
         ptlrpc_at_add_timed(req);
 
-- 
1.8.3.1