From: Simon Wilkinson <sxw@your-file-system.com>
Date: Thu, 1 Nov 2012 17:44:07 +0000 (+0000)
Subject: rx: Remove unused origPeer parameter to FindPeer
X-Git-Tag: openafs-stable-1_8_0pre1~1764
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=4abcf4a7d1ae0719594d38add9c8ad80a0643f8d

rx: Remove unused origPeer parameter to FindPeer

rxi_FindPeer took an 'origPeer' parameter, which was originally
there as an optimisation to decrement a reference count when replacing
a peer on a connection structure. However, we don't do that any more,
and the origPeer parameter is never used.

Just remove it to simplify this bit of code.

Change-Id: I49127f25dd151082f4e508a28e8cab232e251ed1
Reviewed-on: http://gerrit.openafs.org/8537
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
---

diff --git a/src/rx/rx.c b/src/rx/rx.c
index 4be90a2..77b99e9 100644
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -1069,7 +1069,7 @@ rx_NewConnection(afs_uint32 shost, u_short sport, u_short sservice,
     conn->type = RX_CLIENT_CONNECTION;
     conn->cid = cid;
     conn->epoch = rx_epoch;
-    conn->peer = rxi_FindPeer(shost, sport, 0, 1);
+    conn->peer = rxi_FindPeer(shost, sport, 1);
     conn->serviceId = sservice;
     conn->securityObject = securityObject;
     conn->securityData = (void *) 0;
@@ -2976,12 +2976,9 @@ rxi_ProcessNetError(struct sock_extended_err *err, afs_uint32 addr, afs_uint16 p
 /* Find the peer process represented by the supplied (host,port)
  * combination.  If there is no appropriate active peer structure, a
  * new one will be allocated and initialized
- * The origPeer, if set, is a pointer to a peer structure on which the
- * refcount will be be decremented. This is used to replace the peer
- * structure hanging off a connection structure */
+ */
 struct rx_peer *
-rxi_FindPeer(afs_uint32 host, u_short port,
-	     struct rx_peer *origPeer, int create)
+rxi_FindPeer(afs_uint32 host, u_short port, int create)
 {
     struct rx_peer *pp;
     int hashIndex;
@@ -3011,8 +3008,6 @@ rxi_FindPeer(afs_uint32 host, u_short port,
     if (pp && create) {
 	pp->refCount++;
     }
-    if (origPeer)
-	origPeer->refCount--;
     MUTEX_EXIT(&rx_peerHashTable_lock);
     return pp;
 }
@@ -3089,7 +3084,7 @@ rxi_FindConnection(osi_socket socket, afs_uint32 host,
 	CV_INIT(&conn->conn_call_cv, "conn call cv", CV_DEFAULT, 0);
 	conn->next = rx_connHashTable[hashindex];
 	rx_connHashTable[hashindex] = conn;
-	conn->peer = rxi_FindPeer(host, port, 0, 1);
+	conn->peer = rxi_FindPeer(host, port, 1);
 	conn->type = RX_SERVER_CONNECTION;
 	conn->lastSendTime = clock_Sec();	/* don't GC immediately */
 	conn->epoch = epoch;
@@ -3403,7 +3398,7 @@ rxi_ReceivePacket(struct rx_packet *np, osi_socket socket,
 	struct rx_peer *peer;
 
 	/* Try to look up the peer structure, but don't create one */
-	peer = rxi_FindPeer(host, port, 0, 0);
+	peer = rxi_FindPeer(host, port, 0);
 
 	/* Since this may not be associated with a connection, it may have
 	 * no refCount, meaning we could race with ReapConnections
@@ -8267,7 +8262,7 @@ rx_ClearPeerRPCStats(afs_int32 rxInterface, afs_uint32 peerHost, afs_uint16 peer
     if (rxInterface == -1)
         return;
 
-    peer = rxi_FindPeer(peerHost, peerPort, 0, 0);
+    peer = rxi_FindPeer(peerHost, peerPort, 0);
     if (!peer)
         return;
 
@@ -8334,7 +8329,7 @@ rx_CopyPeerRPCStats(afs_uint64 op, afs_uint32 peerHost, afs_uint16 peerPort)
     if (rpcop_stat == NULL)
         return NULL;
 
-    peer = rxi_FindPeer(peerHost, peerPort, 0, 0);
+    peer = rxi_FindPeer(peerHost, peerPort, 0);
     if (!peer)
         return NULL;
 
diff --git a/src/rx/rx_internal.h b/src/rx/rx_internal.h
index 55dd11e..d081cf5 100644
--- a/src/rx/rx_internal.h
+++ b/src/rx/rx_internal.h
@@ -28,7 +28,7 @@ extern void rxi_ProcessNetError(struct sock_extended_err *err,
                                 afs_uint32 addr, afs_uint16 port);
 #endif
 extern struct rx_peer *rxi_FindPeer(afs_uint32 host, u_short port,
-				    struct rx_peer *origPeer, int create);
+				    int create);
 extern struct rx_packet *rxi_ReceivePacket(struct rx_packet *np,
 					   osi_socket socket, afs_uint32 host,
 					   u_short port, int *tnop,