From: Derrick Brashear Date: Thu, 4 Nov 2010 12:23:52 +0000 (-0400) Subject: openafs 16 merge error on rx mutex inversion fix X-Git-Tag: openafs-devel-1_5_78^0 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=946d3064a3bc6763bdfb0bf8020f3eb3c9d2e2c5;p=packages%2Fo%2Fopenafs.git openafs 16 merge error on rx mutex inversion fix remove an extra bogus line left when cherry-picking. (cherry picked from commit d5ce8d19ace9b87816dd36663420136f5f2ad746) Change-Id: I4fa8cf8c4f0aafc04ffe7a9e48f2437dfb9e19db Reviewed-on: http://gerrit.openafs.org/3256 Tested-by: Jeffrey Altman Reviewed-by: Jeffrey Altman --- diff --git a/src/rx/rx.c b/src/rx/rx.c index dc993fcca..0307577f4 100644 --- a/src/rx/rx.c +++ b/src/rx/rx.c @@ -2481,7 +2481,6 @@ rxi_FreeCall(struct rx_call *call) MUTEX_EXIT(&rx_refcnt_mutex); rxi_ResetCall(call, 0); call->conn->call[channel] = (struct rx_call *)0; - MUTEX_EXIT(&rx_refcnt_mutex); MUTEX_ENTER(&rx_freeCallQueue_lock); SET_CALL_QUEUE_LOCK(call, &rx_freeCallQueue_lock);