From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Sat, 8 Mar 2008 15:43:45 +0000 (+0000)
Subject: windows-cm-callback-remove-call-mutex-hold-20080308
X-Git-Tag: BP-openafs-windows-kdfs-ifs~38
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=694202f29e5eafbcf0a07908ebdc2c67a2eecc3b;p=packages%2Fo%2Fopenafs.git

windows-cm-callback-remove-call-mutex-hold-20080308

LICENSE MIT

Remove all of the code in #ifdef HOLD_CALL_MUTEX as we no longer
use it.
---

diff --git a/src/WINNT/afsd/cm_callback.c b/src/WINNT/afsd/cm_callback.c
index 65eac2921..49ffcd11b 100644
--- a/src/WINNT/afsd/cm_callback.c
+++ b/src/WINNT/afsd/cm_callback.c
@@ -354,9 +354,6 @@ SRXAFSCB_CallBack(struct rx_call *callp, AFSCBFids *fidsArrayp, AFSCBs *cbsArray
     cm_server_t *tsp = NULL;
     cm_cell_t* cellp = NULL;
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_ENTER(&callp->lock);
-#endif
     if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
         host = rx_HostOf(peerp);
         port = rx_PortOf(peerp);
@@ -389,9 +386,6 @@ SRXAFSCB_CallBack(struct rx_call *callp, AFSCBFids *fidsArrayp, AFSCBs *cbsArray
         else
             cm_RevokeCallback(callp, cellp, tfidp);
     }
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_EXIT(&callp->lock);
-#endif
     return 0;
 }
 
@@ -431,9 +425,6 @@ SRXAFSCB_InitCallBackState(struct rx_call *callp)
     unsigned long host = 0;
     unsigned short port = 0;
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_ENTER(&callp->lock);
-#endif
     if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
         host = rx_HostOf(peerp);
         port = rx_PortOf(peerp);
@@ -514,9 +505,6 @@ SRXAFSCB_InitCallBackState(struct rx_call *callp)
             cm_PutServer(tsp);
 	} 
     }
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_EXIT(&callp->lock);
-#endif
     return 0;
 }
 
@@ -548,9 +536,6 @@ SRXAFSCB_Probe(struct rx_call *callp)
     unsigned long host = 0;
     unsigned short port = 0;
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_ENTER(&callp->lock);
-#endif
     if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
         host = rx_HostOf(peerp);
         port = rx_PortOf(peerp);
@@ -560,9 +545,6 @@ SRXAFSCB_Probe(struct rx_call *callp)
               ntohl(host),
               ntohs(port));
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_EXIT(&callp->lock);
-#endif
     return 0;
 }
 
@@ -657,9 +639,6 @@ SRXAFSCB_GetLock(struct rx_call *callp, long index, AFSDBLock *lockp)
     unsigned long host = 0;
     unsigned short port = 0;
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_ENTER(&callp->lock);
-#endif
     if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
         host = rx_HostOf(peerp);
         port = rx_PortOf(peerp);
@@ -702,9 +681,6 @@ SRXAFSCB_GetLock(struct rx_call *callp, long index, AFSDBLock *lockp)
         code = 0;
     }
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_EXIT(&callp->lock);
-#endif
     return code;
 }
 
@@ -720,9 +696,6 @@ SRXAFSCB_GetCE(struct rx_call *callp, long index, AFSDBCacheEntry *cep)
     unsigned long host = 0;
     unsigned short port = 0;
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_ENTER(&callp->lock);
-#endif
     if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
         host = rx_HostOf(peerp);
         port = rx_PortOf(peerp);
@@ -814,9 +787,6 @@ SRXAFSCB_GetCE(struct rx_call *callp, long index, AFSDBCacheEntry *cep)
   fcnDone:
     lock_ReleaseRead(&cm_scacheLock);
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_EXIT(&callp->lock);
-#endif
     return (code);
 }
 
@@ -832,9 +802,6 @@ SRXAFSCB_GetCE64(struct rx_call *callp, long index, AFSDBCacheEntry64 *cep)
     unsigned long host = 0;
     unsigned short port = 0;
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_ENTER(&callp->lock);
-#endif
     if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
         host = rx_HostOf(peerp);
         port = rx_PortOf(peerp);
@@ -931,9 +898,6 @@ SRXAFSCB_GetCE64(struct rx_call *callp, long index, AFSDBCacheEntry64 *cep)
   fcnDone:
     lock_ReleaseRead(&cm_scacheLock);
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_EXIT(&callp->lock);
-#endif
     return (code);
 }
 
@@ -946,9 +910,6 @@ SRXAFSCB_XStatsVersion(struct rx_call *callp, long *vp)
     unsigned long host = 0;
     unsigned short port = 0;
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_ENTER(&callp->lock);
-#endif
     if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
         host = rx_HostOf(peerp);
         port = rx_PortOf(peerp);
@@ -958,9 +919,6 @@ SRXAFSCB_XStatsVersion(struct rx_call *callp, long *vp)
              ntohl(host), ntohs(port));
     *vp = -1;
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_EXIT(&callp->lock);
-#endif
     return RXGEN_OPCODE;
 }
 
@@ -974,9 +932,6 @@ SRXAFSCB_GetXStats(struct rx_call *callp, long cvn, long coln, long *srvp, long
     unsigned long host = 0;
     unsigned short port = 0;
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_ENTER(&callp->lock);
-#endif
     if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
         host = rx_HostOf(peerp);
         port = rx_PortOf(peerp);
@@ -985,9 +940,6 @@ SRXAFSCB_GetXStats(struct rx_call *callp, long cvn, long coln, long *srvp, long
     osi_Log2(afsd_logp, "SRXAFSCB_GetXStats from host 0x%x port %d - not implemented",
              ntohl(host), ntohs(port));
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_EXIT(&callp->lock);
-#endif
     return RXGEN_OPCODE;
 }
 
@@ -1015,9 +967,6 @@ SRXAFSCB_WhoAreYou(struct rx_call *callp, struct interfaceAddr* addr)
     unsigned long host = 0;
     unsigned short port = 0;
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_ENTER(&callp->lock);
-#endif
     if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
         host = rx_HostOf(peerp);
         port = rx_PortOf(peerp);
@@ -1043,9 +992,6 @@ SRXAFSCB_WhoAreYou(struct rx_call *callp, struct interfaceAddr* addr)
             cm_NetMtu[i] : rx_mtu;
     }
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_EXIT(&callp->lock);
-#endif
     return 0;
 }
 
@@ -1074,9 +1020,6 @@ SRXAFSCB_ProbeUuid(struct rx_call *callp, afsUUID* clientUuid)
     char *p,*q;
     int code = 0;
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_ENTER(&callp->lock);
-#endif
     if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
         host = rx_HostOf(peerp);
         port = rx_PortOf(peerp);
@@ -1099,9 +1042,6 @@ SRXAFSCB_ProbeUuid(struct rx_call *callp, afsUUID* clientUuid)
                   ntohl(host),
                   ntohs(port));
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_EXIT(&callp->lock);
-#endif
     return code;
 }
 
@@ -1151,9 +1091,6 @@ SRXAFSCB_GetCellByNum(struct rx_call *callp, afs_int32 a_cellnum,
     unsigned short port = 0;
     int rc;
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_ENTER(&callp->lock);
-#endif
     if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
         host = rx_HostOf(peerp);
         port = rx_PortOf(peerp);
@@ -1168,9 +1105,6 @@ SRXAFSCB_GetCellByNum(struct rx_call *callp, afs_int32 a_cellnum,
 
     rc = GetCellCommon(a_cellnum, a_name, a_hosts);
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_EXIT(&callp->lock);
-#endif
     return rc;
 }
 
@@ -1194,9 +1128,6 @@ SRXAFSCB_TellMeAboutYourself( struct rx_call *callp,
     unsigned long host = 0;
     unsigned short port = 0;
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_ENTER(&callp->lock);
-#endif
     if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
         host = rx_HostOf(peerp);
         port = rx_PortOf(peerp);
@@ -1228,9 +1159,6 @@ SRXAFSCB_TellMeAboutYourself( struct rx_call *callp,
     capabilities->Capabilities_len = dataBytes / sizeof(afs_int32);
     capabilities->Capabilities_val = dataBuffP;
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_EXIT(&callp->lock);
-#endif
     return 0;
 }
 
@@ -1267,9 +1195,6 @@ int SRXAFSCB_GetServerPrefs(
     unsigned long host = 0;
     unsigned short port = 0;
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_ENTER(&callp->lock);
-#endif
     if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
         host = rx_HostOf(peerp);
         port = rx_PortOf(peerp);
@@ -1282,9 +1207,6 @@ int SRXAFSCB_GetServerPrefs(
     *a_srvr_addr = 0xffffffff;
     *a_srvr_rank = 0xffffffff;
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_EXIT(&callp->lock);
-#endif
     return 0;
 }
 
@@ -1319,9 +1241,6 @@ int SRXAFSCB_GetCellServDB(struct rx_call *callp, afs_int32 index, char **a_name
     unsigned short port = 0;
     int rc;
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_ENTER(&callp->lock);
-#endif
     if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
         host = rx_HostOf(peerp);
         port = rx_PortOf(peerp);
@@ -1369,9 +1288,6 @@ int SRXAFSCB_GetLocalCell(struct rx_call *callp, char **a_name)
     unsigned long host = 0;
     unsigned short port = 0;
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_ENTER(&callp->lock);
-#endif
     if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
         host = rx_HostOf(peerp);
         port = rx_PortOf(peerp);
@@ -1389,9 +1305,6 @@ int SRXAFSCB_GetLocalCell(struct rx_call *callp, char **a_name)
     }
     *a_name = t_name;
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_EXIT(&callp->lock);
-#endif
     return 0;
 }
 
@@ -1471,9 +1384,6 @@ int SRXAFSCB_GetCacheConfig(struct rx_call *callp,
     unsigned long host = 0;
     unsigned short port = 0;
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_ENTER(&callp->lock);
-#endif
     if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
         host = rx_HostOf(peerp);
         port = rx_PortOf(peerp);
@@ -1501,9 +1411,6 @@ int SRXAFSCB_GetCacheConfig(struct rx_call *callp,
     config->cacheConfig_val = t_config;
     config->cacheConfig_len = (*configCount)/sizeof(afs_uint32);
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_EXIT(&callp->lock);
-#endif
     return 0;
 }