From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 25 Jan 2010 21:49:53 +0000 (-0500)
Subject: rx ResetCall should wait if it says it will
X-Git-Tag: openafs-devel-1_5_71~20
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=f3da1f9e1af4daa5b6f3ec46bad3db5226377fc4;p=packages%2Fo%2Fopenafs.git

rx ResetCall should wait if it says it will

We set TQ_WAIT... and then don't bother to wait. uh.

Change-Id: Ia7d3e52c8880db53fcf26b7d79ad349720018701
Reviewed-on: http://gerrit.openafs.org/1160
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/rx/rx.c b/src/rx/rx.c
index ec342d8cc..9d4e3d57f 100755
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -4711,6 +4711,11 @@ rxi_ResetCall(struct rx_call *call, int newcall)
     if (flags & RX_CALL_TQ_BUSY) {
 	call->flags = RX_CALL_TQ_CLEARME | RX_CALL_TQ_BUSY;
 	call->flags |= (flags & RX_CALL_TQ_WAIT);
+#ifdef RX_ENABLE_LOCKS
+        CV_WAIT(&call->cv_tq, &call->lock);
+#else /* RX_ENABLE_LOCKS */
+        osi_rxSleep(&call->tq);
+#endif /* RX_ENABLE_LOCKS */
     } else
 #endif /* AFS_GLOBAL_RXLOCK_KERNEL */
     {