From: Derrick Brashear <shadow@dementia.org>
Date: Sat, 30 Jan 2010 18:54:20 +0000 (-0500)
Subject: rx idledeadtime don't track window wait
X-Git-Tag: openafs-stable-1_4_12pre2~1
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=7b9e9e3c61d11a52ae5571cafdfe1b9fcd18d04b;p=packages%2Fo%2Fopenafs.git

rx idledeadtime don't track window wait

if we're in writer mode and waiting for more window, don't consider it idle.

Change-Id: Id1e80f297929eef363ffe88bfe181b74bb331515
Reviewed-on: http://gerrit.openafs.org/1182
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit d52213fcc5dae5095d660e1861f77e90c07bb2ab)
Reviewed-on: http://gerrit.openafs.org/1183
---

diff --git a/src/rx/rx.c b/src/rx/rx.c
index 27e25feea..4eba8a563 100644
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -5472,7 +5472,8 @@ rxi_CheckCall(register struct rx_call *call)
     }
     /* see if we have a non-activity timeout */
     if (call->startWait && conn->idleDeadTime
-	&& ((call->startWait + conn->idleDeadTime) < now)) {
+	&& ((call->startWait + conn->idleDeadTime) < now) &&
+	(call->flags & RX_CALL_READER_WAIT)) {
 	if (call->state == RX_STATE_ACTIVE) {
 	    rxi_CallError(call, RX_CALL_TIMEOUT);
 	    return -1;