From: Derrick Brashear <shadow@dementia.org>
Date: Thu, 17 Dec 2009 07:15:53 +0000 (-0500)
Subject: rx 1.4 mutex naming
X-Git-Tag: openafs-stable-1_4_12pre1~20
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=462c6ce22466410b9dbc500c1472e596e5b18247;p=packages%2Fo%2Fopenafs.git

rx 1.4 mutex naming

in 1.4 rx has just the stats mutex. protect the thread counter with it

Change-Id: Iceec83f23480d3085df711b6fdbcf1171f10bc1a
Reviewed-on: http://gerrit.openafs.org/983
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/rx/rx.c b/src/rx/rx.c
index 0fdb8ab5a..27e25feea 100644
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -1562,10 +1562,10 @@ rx_GetCall(int tno, struct rx_service *cur_service, osi_socket * socketp)
 		if (!QuotaOK(service)) {
 		    continue;
 		}
-		MUTEX_ENTER(&rx_pthread_mutex);
+		MUTEX_ENTER(&rx_stats_mutex);
 		if (tno == rxi_fcfs_thread_num
 		    || !tcall->queue_item_header.next) {
-		    MUTEX_EXIT(&rx_pthread_mutex);
+		    MUTEX_EXIT(&rx_stats_mutex);
 		    /* If we're the fcfs thread , then  we'll just use 
 		     * this call. If we haven't been able to find an optimal 
 		     * choice, and we're at the end of the list, then use a 
@@ -1573,7 +1573,7 @@ rx_GetCall(int tno, struct rx_service *cur_service, osi_socket * socketp)
 		    call = (choice2 ? choice2 : tcall);
 		    service = call->conn->service;
 		} else {
-		    MUTEX_EXIT(&rx_pthread_mutex);
+		    MUTEX_EXIT(&rx_stats_mutex);
 		    if (!queue_IsEmpty(&tcall->rq)) {
 			struct rx_packet *rp;
 			rp = queue_First(&tcall->rq, rx_packet);
@@ -1735,10 +1735,10 @@ rx_GetCall(int tno, struct rx_service *cur_service, osi_socket * socketp)
 	for (queue_Scan(&rx_incomingCallQueue, tcall, ncall, rx_call)) {
 	    service = tcall->conn->service;
 	    if (QuotaOK(service)) {
-		MUTEX_ENTER(&rx_pthread_mutex);
+		MUTEX_ENTER(&rx_stats_mutex);
 		if (tno == rxi_fcfs_thread_num
 		    || !tcall->queue_item_header.next) {
-		    MUTEX_EXIT(&rx_pthread_mutex);
+		    MUTEX_EXIT(&rx_stats_mutex);
 		    /* If we're the fcfs thread, then  we'll just use 
 		     * this call. If we haven't been able to find an optimal 
 		     * choice, and we're at the end of the list, then use a 
@@ -1746,7 +1746,7 @@ rx_GetCall(int tno, struct rx_service *cur_service, osi_socket * socketp)
 		    call = (choice2 ? choice2 : tcall);
 		    service = call->conn->service;
 		} else {
-		    MUTEX_EXIT(&rx_pthread_mutex);
+		    MUTEX_EXIT(&rx_stats_mutex);
 		    if (!queue_IsEmpty(&tcall->rq)) {
 			struct rx_packet *rp;
 			rp = queue_First(&tcall->rq, rx_packet);