From: Derrick Brashear <shadow@dementia.org>
Date: Wed, 2 Mar 2011 13:12:38 +0000 (-0500)
Subject: rx: cancel growmtu event on resetcall
X-Git-Tag: debian/1.6.0.pre3-1~5^2^2~35
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=f38c9aeff78db6cebd654051aa1f9ba86f11a2fd;p=packages%2Fo%2Fopenafs.git

rx: cancel growmtu event on resetcall

attempt at fixing issue reported by Ryan Underwood.

Reviewed-on: http://gerrit.openafs.org/4108
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 7d516192bed12aa3137bcb86cbe0d8ecd492415c)

Change-Id: Iae0d290a41d2df1482e399721469984732096bf4
Reviewed-on: http://gerrit.openafs.org/4112
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/rx/rx.c b/src/rx/rx.c
index 1dabfb034..5058ae535 100644
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -5121,6 +5121,10 @@ rxi_ResetCall(struct rx_call *call, int newcall)
 	call->arrivalProc = (void (*)())0;
     }
 
+    if (call->growMTUEvent)
+	rxevent_Cancel(call->growMTUEvent, call,
+		       RX_CALL_REFCOUNT_ALIVE);
+
     if (call->delayedAbortEvent) {
 	rxevent_Cancel(call->delayedAbortEvent, call, RX_CALL_REFCOUNT_ABORT);
 	packet = rxi_AllocPacket(RX_PACKET_CLASS_SPECIAL);
@@ -6141,6 +6145,9 @@ rxi_CheckCall(struct rx_call *call)
 	    rxevent_Cancel(call->resendEvent, call, RX_CALL_REFCOUNT_RESEND);
 	    rxevent_Cancel(call->keepAliveEvent, call,
 			   RX_CALL_REFCOUNT_ALIVE);
+	    if (call->growMTUEvent)
+		rxevent_Cancel(call->growMTUEvent, call,
+			       RX_CALL_REFCOUNT_ALIVE);
             MUTEX_ENTER(&rx_refcnt_mutex);
 	    if (call->refCount == 0) {
 		rxi_FreeCall(call, haveCTLock);