DEVEL15-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.

(cherry picked from commit 694202f29e5eafbcf0a07908ebdc2c67a2eecc3b)

diff --git a/src/WINNT/afsd/cm_callback.c b/src/WINNT/afsd/cm_callback.c
index f2a753722fbb41c7e6b46c78e67eed6e20a5abf7..940d47ce487c064dc1eb003cc8f542e7a5eb9d05 100644 (file)
--- a/src/WINNT/afsd/cm_callback.c
+++ b/src/WINNT/afsd/cm_callback.c
@@ -358,9 +358,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);
@@ -393,9 +390,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;
 }
 
@@ -435,9 +429,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);
@@ -518,9 +509,6 @@ SRXAFSCB_InitCallBackState(struct rx_call *callp)
             cm_PutServer(tsp);
        } 
     }
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_EXIT(&callp->lock);
-#endif
     return 0;
 }
 
@@ -552,9 +540,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);
@@ -564,9 +549,6 @@ SRXAFSCB_Probe(struct rx_call *callp)
               ntohl(host),
               ntohs(port));
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_EXIT(&callp->lock);
-#endif
     return 0;
 }
 
@@ -661,9 +643,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);
@@ -706,9 +685,6 @@ SRXAFSCB_GetLock(struct rx_call *callp, long index, AFSDBLock *lockp)
         code = 0;
     }
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_EXIT(&callp->lock);
-#endif
     return code;
 }
 
@@ -724,9 +700,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);
@@ -818,9 +791,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);
 }
 
@@ -836,9 +806,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);
@@ -935,9 +902,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);
 }
 
@@ -950,9 +914,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);
@@ -962,9 +923,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;
 }
 
@@ -978,9 +936,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);
@@ -989,9 +944,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;
 }
 
@@ -1019,9 +971,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);
@@ -1047,9 +996,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;
 }
 
@@ -1078,9 +1024,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);
@@ -1103,9 +1046,6 @@ SRXAFSCB_ProbeUuid(struct rx_call *callp, afsUUID* clientUuid)
                   ntohl(host),
                   ntohs(port));
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_EXIT(&callp->lock);
-#endif
     return code;
 }
 
@@ -1155,9 +1095,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);
@@ -1172,9 +1109,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;
 }
 
@@ -1198,9 +1132,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);
@@ -1232,9 +1163,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;
 }
 
@@ -1271,9 +1199,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);
@@ -1286,9 +1211,6 @@ int SRXAFSCB_GetServerPrefs(
     *a_srvr_addr = 0xffffffff;
     *a_srvr_rank = 0xffffffff;
 
-#ifdef HOLD_CALL_MUTEX
-    MUTEX_EXIT(&callp->lock);
-#endif
     return 0;
 }
 
@@ -1323,9 +1245,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);
@@ -1373,9 +1292,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);
@@ -1393,9 +1309,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;
 }
 
@@ -1475,9 +1388,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);
@@ -1505,9 +1415,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;
 }