From 1774fe3eeae11f373e0fe133623ec7c801519cf1 Mon Sep 17 00:00:00 2001 From: tappro Date: Thu, 11 Sep 2008 06:58:42 +0000 Subject: [PATCH] - revert back 18957 --- lustre/ptlrpc/service.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c index 2c8e179..5ec0105 100644 --- a/lustre/ptlrpc/service.c +++ b/lustre/ptlrpc/service.c @@ -699,22 +699,15 @@ static int ptlrpc_at_send_early_reply(struct ptlrpc_request *req, RETURN(-ENOSYS); } - if (req->rq_export->exp_in_recovery) { - /* don't increase server estimates during recovery, and give - clients the full recovery time. */ - newdl = cfs_time_current_sec() + - req->rq_export->exp_obd->obd_recovery_timeout; - } else { - if (extra_time) { - /* Fake our processing time into the future to ask the - clients for some extra amount of time */ - extra_time += cfs_time_current_sec() - - req->rq_arrival_time.tv_sec; - at_add(&svc->srv_at_estimate, extra_time); - } - newdl = req->rq_arrival_time.tv_sec + - at_get(&svc->srv_at_estimate); + if (extra_time) { + /* Fake our processing time into the future to ask the + * clients for some extra amount of time */ + extra_time += cfs_time_current_sec() - + req->rq_arrival_time.tv_sec; + at_add(&svc->srv_at_estimate, extra_time); } + + newdl = req->rq_arrival_time.tv_sec + at_get(&svc->srv_at_estimate); if (req->rq_deadline >= newdl) { /* We're not adding any time, no need to send an early reply (e.g. maybe at adaptive_max) */ -- 1.8.3.1