From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Thu, 25 Sep 2008 18:26:47 +0000 (+0000)
Subject: STABLE14-rx-global-lock-macro-correction-20080925
X-Git-Tag: openafs-stable-1_4_8pre1~1
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=3758f80c3eeae57c71284ef7b68c960f2b7e8878;p=packages%2Fo%2Fopenafs.git

STABLE14-rx-global-lock-macro-correction-20080925

LICENSE IPL10

refer to the same macro everyone else does


(cherry picked from commit 939e070c869b46abc707bbd916d4dfbe1e66a55e)
---

diff --git a/src/rx/rx.c b/src/rx/rx.c
index 6e888f2ac..245527cd2 100644
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -4407,7 +4407,7 @@ rxi_CallError(register struct rx_call *call, afs_int32 error)
 {
     if (call->error)
 	error = call->error;
-#ifdef RX_GLOBAL_RXLOCK_KERNEL
+#ifdef AFS_GLOBAL_RXLOCK_KERNEL
     if (!((call->flags & RX_CALL_TQ_BUSY) || (call->tqWaiters > 0))) {
 	rxi_ResetCall(call, 0);
     }
@@ -5404,7 +5404,7 @@ rxi_CheckCall(register struct rx_call *call)
     afs_uint32 now;
     afs_uint32 deadTime;
 
-#ifdef RX_GLOBAL_RXLOCK_KERNEL
+#ifdef AFS_GLOBAL_RXLOCK_KERNEL
     if (call->flags & RX_CALL_TQ_BUSY) {
 	/* Call is active and will be reset by rxi_Start if it's
 	 * in an error state.