]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
DEVEL15-rx-global-lock-macro-correction-20080925
authorJeffrey Altman <jaltman@secure-endpoints.com>
Thu, 25 Sep 2008 18:26:35 +0000 (18:26 +0000)
committerDerrick Brashear <shadow@dementia.org>
Thu, 25 Sep 2008 18:26:35 +0000 (18:26 +0000)
LICENSE IPL10

refer to the same macro everyone else does

(cherry picked from commit 939e070c869b46abc707bbd916d4dfbe1e66a55e)

src/rx/rx.c

index b4b9083b367d9a797a126e7a84b3c55922a16fc2..6b94cca1c41ed6919d412dfecdd21a460b705ca7 100644 (file)
@@ -4499,7 +4499,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);
     }
@@ -5510,7 +5510,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.