]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
rx 1.4 mutex naming
authorDerrick Brashear <shadow@dementia.org>
Thu, 17 Dec 2009 07:15:53 +0000 (02:15 -0500)
committerDerrick Brashear <shadow|account-1000005@unknown>
Thu, 17 Dec 2009 07:17:55 +0000 (23:17 -0800)
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>
src/rx/rx.c

index 0fdb8ab5a78e2aa8afbb99ac7da6af3693fa45eb..27e25feeaba2a36c454a4ff43a43809c376d8258 100644 (file)
@@ -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);