From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Thu, 5 Apr 2012 21:16:15 +0000 (-0400)
Subject: rx: fix bad merge 95c38dff3740d7e24971ceb5875c06e7abfce102
X-Git-Tag: upstream/1.8.0_pre1^2~2641
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=ea82d1014372383334fd05c01db135da870d3928;p=packages%2Fo%2Fopenafs.git

rx: fix bad merge 95c38dff3740d7e24971ceb5875c06e7abfce102

An extra

  CALL_HOLD(call, RX_CALL_REFCOUNT_BEGIN)

was added in rx_NewCall().  Revert it.

Change-Id: Ief1493ae9ec69ace5afd534a97fbf43f55872153
Reviewed-on: http://gerrit.openafs.org/7050
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>
---

diff --git a/src/rx/rx.c b/src/rx/rx.c
index 14d518697..7ac47deed 100644
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -1495,7 +1495,6 @@ rx_NewCall(struct rx_connection *conn)
                          * effect on overall system performance.
                          */
                         call->state = RX_STATE_RESET;
-                        CALL_HOLD(call, RX_CALL_REFCOUNT_BEGIN);
                         (*call->callNumber)++;
                         MUTEX_EXIT(&conn->conn_call_lock);
                         CALL_HOLD(call, RX_CALL_REFCOUNT_BEGIN);