From 94c47bfe66c651d18ec283c1fcd3540d126872f1 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Mon, 21 Jul 2008 17:19:53 +0000 Subject: [PATCH] DEVEL15-windows-callp-to-rxcallp-20080721 LICENSE MIT There has been long time confusion in the windows cache manager because there are cm_conn object ptrs call connp and rx_connection object ptrs call connp and rx_call object ptrs called callp and rx_connection object ptrs called callp. From now on, rxconnp is a ptr to an rx_connection object; rxcallp is a ptr to an rx_call object; and connp is a ptr to an cm_conn object. (cherry picked from commit a92cd4ec76509a84a93764b94831114e00bbc3d5) --- src/WINNT/afsd/cm_callback.c | 8 +-- src/WINNT/afsd/cm_dcache.c | 80 ++++++++++++++--------------- src/WINNT/afsd/cm_ioctl.c | 32 ++++++------ src/WINNT/afsd/cm_vnodeops.c | 98 ++++++++++++++++++------------------ src/WINNT/afsd/cm_volume.c | 20 ++++---- 5 files changed, 119 insertions(+), 119 deletions(-) diff --git a/src/WINNT/afsd/cm_callback.c b/src/WINNT/afsd/cm_callback.c index ffa1306bf..dfe849c98 100644 --- a/src/WINNT/afsd/cm_callback.c +++ b/src/WINNT/afsd/cm_callback.c @@ -1671,7 +1671,7 @@ long cm_GetCallback(cm_scache_t *scp, struct cm_user *userp, cm_callbackRequest_t cbr; int mustCall; cm_fid_t sfid; - struct rx_connection * callp = NULL; + struct rx_connection * rxconnp = NULL; int syncop_done = 0; osi_Log4(afsd_logp, "GetCallback scp 0x%p cell %d vol %d flags %lX", @@ -1745,10 +1745,10 @@ long cm_GetCallback(cm_scache_t *scp, struct cm_user *userp, if (code) continue; - callp = cm_GetRxConn(connp); - code = RXAFS_FetchStatus(callp, &tfid, + rxconnp = cm_GetRxConn(connp); + code = RXAFS_FetchStatus(rxconnp, &tfid, &afsStatus, &callback, &volSync); - rx_PutConnection(callp); + rx_PutConnection(rxconnp); } while (cm_Analyze(connp, userp, reqp, &sfid, &volSync, NULL, &cbr, code)); diff --git a/src/WINNT/afsd/cm_dcache.c b/src/WINNT/afsd/cm_dcache.c index 3b7ffb358..d7852b6e2 100644 --- a/src/WINNT/afsd/cm_dcache.c +++ b/src/WINNT/afsd/cm_dcache.c @@ -62,7 +62,7 @@ long cm_BufWrite(void *vscp, osi_hyper_t *offsetp, long length, long flags, osi_hyper_t thyper; AFSVolSync volSync; AFSFid tfid; - struct rx_call *callp; + struct rx_call *rxcallp; struct rx_connection *rxconnp; osi_queueData_t *qdp; cm_buf_t *bufp; @@ -153,7 +153,7 @@ long cm_BufWrite(void *vscp, osi_hyper_t *offsetp, long length, long flags, retry: rxconnp = cm_GetRxConn(connp); - callp = rx_NewCall(rxconnp); + rxcallp = rx_NewCall(rxconnp); rx_PutConnection(rxconnp); #ifdef AFS_LARGEFILES @@ -161,7 +161,7 @@ long cm_BufWrite(void *vscp, osi_hyper_t *offsetp, long length, long flags, osi_Log4(afsd_logp, "CALL StartRXAFS_StoreData64 scp 0x%p, offset 0x%x:%08x, length 0x%x", scp, biod.offset.HighPart, biod.offset.LowPart, nbytes); - code = StartRXAFS_StoreData64(callp, &tfid, &inStatus, + code = StartRXAFS_StoreData64(rxcallp, &tfid, &inStatus, biod.offset.QuadPart, nbytes, truncPos.QuadPart); @@ -177,7 +177,7 @@ long cm_BufWrite(void *vscp, osi_hyper_t *offsetp, long length, long flags, osi_Log4(afsd_logp, "CALL StartRXAFS_StoreData scp 0x%p, offset 0x%x:%08x, length 0x%x", scp, biod.offset.HighPart, biod.offset.LowPart, nbytes); - code = StartRXAFS_StoreData(callp, &tfid, &inStatus, + code = StartRXAFS_StoreData(rxcallp, &tfid, &inStatus, biod.offset.LowPart, nbytes, truncPos.LowPart); if (code) osi_Log1(afsd_logp, "CALL StartRXAFS_StoreData FAILURE, code 0x%x", code); @@ -189,7 +189,7 @@ long cm_BufWrite(void *vscp, osi_hyper_t *offsetp, long length, long flags, osi_Log4(afsd_logp, "CALL StartRXAFS_StoreData scp 0x%p, offset 0x%x:%08x, length 0x%x", scp, biod.offset.HighPart, biod.offset.LowPart, nbytes); - code = StartRXAFS_StoreData(callp, &tfid, &inStatus, + code = StartRXAFS_StoreData(rxcallp, &tfid, &inStatus, biod.offset.LowPart, nbytes, truncPos.LowPart); if (code) osi_Log1(afsd_logp, "CALL StartRXAFS_StoreData FAILURE, code 0x%x", code); @@ -213,7 +213,7 @@ long cm_BufWrite(void *vscp, osi_hyper_t *offsetp, long length, long flags, wbytes = cm_data.buf_blockSize; /* write out wbytes of data from bufferp */ - temp = rx_Write(callp, bufferp, wbytes); + temp = rx_Write(rxcallp, bufferp, wbytes); if (temp != wbytes) { osi_Log3(afsd_logp, "rx_Write failed bp 0x%p, %d != %d",bufp,temp,wbytes); code = -1; @@ -227,13 +227,13 @@ long cm_BufWrite(void *vscp, osi_hyper_t *offsetp, long length, long flags, if (code == 0) { if (SERVERHAS64BIT(connp)) { - code = EndRXAFS_StoreData64(callp, &outStatus, &volSync); + code = EndRXAFS_StoreData64(rxcallp, &outStatus, &volSync); if (code) osi_Log2(afsd_logp, "EndRXAFS_StoreData64 FAILURE scp 0x%p code %lX", scp, code); else osi_Log0(afsd_logp, "EndRXAFS_StoreData64 SUCCESS"); } else { - code = EndRXAFS_StoreData(callp, &outStatus, &volSync); + code = EndRXAFS_StoreData(rxcallp, &outStatus, &volSync); if (code) osi_Log2(afsd_logp, "EndRXAFS_StoreData FAILURE scp 0x%p code %lX",scp,code); else @@ -241,7 +241,7 @@ long cm_BufWrite(void *vscp, osi_hyper_t *offsetp, long length, long flags, } } - code = rx_EndCall(callp, code); + code = rx_EndCall(rxcallp, code); #ifdef AFS_LARGEFILES if (code == RXGEN_OPCODE && SERVERHAS64BIT(connp)) { @@ -322,7 +322,7 @@ long cm_StoreMini(cm_scache_t *scp, cm_user_t *userp, cm_req_t *reqp) long code; osi_hyper_t truncPos; cm_conn_t *connp; - struct rx_call *callp; + struct rx_call *rxcallp; struct rx_connection *rxconnp; int require_64bit_ops = 0; @@ -360,33 +360,33 @@ long cm_StoreMini(cm_scache_t *scp, cm_user_t *userp, cm_req_t *reqp) retry: rxconnp = cm_GetRxConn(connp); - callp = rx_NewCall(rxconnp); + rxcallp = rx_NewCall(rxconnp); rx_PutConnection(rxconnp); #ifdef AFS_LARGEFILES if (SERVERHAS64BIT(connp)) { - code = StartRXAFS_StoreData64(callp, &tfid, &inStatus, + code = StartRXAFS_StoreData64(rxcallp, &tfid, &inStatus, 0, 0, truncPos.QuadPart); } else { if (require_64bit_ops) { code = CM_ERROR_TOOBIG; } else { - code = StartRXAFS_StoreData(callp, &tfid, &inStatus, + code = StartRXAFS_StoreData(rxcallp, &tfid, &inStatus, 0, 0, truncPos.LowPart); } } #else - code = StartRXAFS_StoreData(callp, &tfid, &inStatus, + code = StartRXAFS_StoreData(rxcallp, &tfid, &inStatus, 0, 0, truncPos.LowPart); #endif if (code == 0) { if (SERVERHAS64BIT(connp)) - code = EndRXAFS_StoreData64(callp, &outStatus, &volSync); + code = EndRXAFS_StoreData64(rxcallp, &outStatus, &volSync); else - code = EndRXAFS_StoreData(callp, &outStatus, &volSync); + code = EndRXAFS_StoreData(rxcallp, &outStatus, &volSync); } - code = rx_EndCall(callp, code); + code = rx_EndCall(rxcallp, code); #ifdef AFS_LARGEFILES if (code == RXGEN_OPCODE && SERVERHAS64BIT(connp)) { @@ -1344,7 +1344,7 @@ long cm_GetBuffer(cm_scache_t *scp, cm_buf_t *bufp, int *cpffp, cm_user_t *userp cm_buf_t *tbufp; /* buf we're filling */ osi_queueData_t *qdp; /* q element we're scanning */ AFSFid tfid; - struct rx_call *callp; + struct rx_call *rxcallp; struct rx_connection *rxconnp; cm_bulkIO_t biod; /* bulk IO descriptor */ cm_conn_t *connp; @@ -1499,7 +1499,7 @@ long cm_GetBuffer(cm_scache_t *scp, cm_buf_t *bufp, int *cpffp, cm_user_t *userp continue; rxconnp = cm_GetRxConn(connp); - callp = rx_NewCall(rxconnp); + rxcallp = rx_NewCall(rxconnp); rx_PutConnection(rxconnp); #ifdef AFS_LARGEFILES @@ -1509,17 +1509,17 @@ long cm_GetBuffer(cm_scache_t *scp, cm_buf_t *bufp, int *cpffp, cm_user_t *userp osi_Log4(afsd_logp, "CALL FetchData64 scp 0x%p, off 0x%x:%08x, size 0x%x", scp, biod.offset.HighPart, biod.offset.LowPart, biod.length); - code = StartRXAFS_FetchData64(callp, &tfid, biod.offset.QuadPart, biod.length); + code = StartRXAFS_FetchData64(rxcallp, &tfid, biod.offset.QuadPart, biod.length); if (code == 0) { - temp = rx_Read(callp, (char *) &nbytes_hi, sizeof(afs_int32)); + temp = rx_Read(rxcallp, (char *) &nbytes_hi, sizeof(afs_int32)); if (temp == sizeof(afs_int32)) { nbytes_hi = ntohl(nbytes_hi); } else { nbytes_hi = 0; - code = callp->error; - rx_EndCall(callp, code); - callp = NULL; + code = rxcallp->error; + rx_EndCall(rxcallp, code); + rxcallp = NULL; } } } @@ -1529,16 +1529,16 @@ long cm_GetBuffer(cm_scache_t *scp, cm_buf_t *bufp, int *cpffp, cm_user_t *userp osi_Log0(afsd_logp, "Skipping FetchData. Operation requires FetchData64"); code = CM_ERROR_TOOBIG; } else { - if (!callp) { + if (!rxcallp) { rxconnp = cm_GetRxConn(connp); - callp = rx_NewCall(rxconnp); + rxcallp = rx_NewCall(rxconnp); rx_PutConnection(rxconnp); } osi_Log3(afsd_logp, "CALL FetchData scp 0x%p, off 0x%x, size 0x%x", scp, biod.offset.LowPart, biod.length); - code = StartRXAFS_FetchData(callp, &tfid, biod.offset.LowPart, + code = StartRXAFS_FetchData(rxcallp, &tfid, biod.offset.LowPart, biod.length); SET_SERVERHASNO64BIT(connp); @@ -1546,14 +1546,14 @@ long cm_GetBuffer(cm_scache_t *scp, cm_buf_t *bufp, int *cpffp, cm_user_t *userp } if (code == 0) { - temp = rx_Read(callp, (char *)&nbytes, sizeof(afs_int32)); + temp = rx_Read(rxcallp, (char *)&nbytes, sizeof(afs_int32)); if (temp == sizeof(afs_int32)) { nbytes = ntohl(nbytes); FillInt64(length_found, nbytes_hi, nbytes); if (length_found > biod.length) - code = (callp->error < 0) ? callp->error : -1; + code = (rxcallp->error < 0) ? rxcallp->error : -1; } else { - code = (callp->error < 0) ? callp->error : -1; + code = (rxcallp->error < 0) ? rxcallp->error : -1; } } /* for the moment, nbytes_hi will always be 0 if code == 0 @@ -1562,19 +1562,19 @@ long cm_GetBuffer(cm_scache_t *scp, cm_buf_t *bufp, int *cpffp, cm_user_t *userp osi_Log3(afsd_logp, "CALL FetchData scp 0x%p, off 0x%x, size 0x%x", scp, biod.offset.LowPart, biod.length); - code = StartRXAFS_FetchData(callp, &tfid, biod.offset.LowPart, + code = StartRXAFS_FetchData(rxcallp, &tfid, biod.offset.LowPart, biod.length); /* now copy the data out of the pipe and put it in the buffer */ if (code == 0) { - temp = rx_Read(callp, (char *)&nbytes, sizeof(afs_int32)); + temp = rx_Read(rxcallp, (char *)&nbytes, sizeof(afs_int32)); if (temp == sizeof(afs_int32)) { nbytes = ntohl(nbytes); if (nbytes > biod.length) - code = (callp->error < 0) ? callp->error : -1; + code = (rxcallp->error < 0) ? rxcallp->error : -1; } else - code = (callp->error < 0) ? callp->error : -1; + code = (rxcallp->error < 0) ? rxcallp->error : -1; } #endif @@ -1602,9 +1602,9 @@ long cm_GetBuffer(cm_scache_t *scp, cm_buf_t *bufp, int *cpffp, cm_user_t *userp /* read rbytes of data */ rbytes = (nbytes > cm_data.buf_blockSize? cm_data.buf_blockSize : nbytes); - temp = rx_Read(callp, bufferp, rbytes); + temp = rx_Read(rxcallp, bufferp, rbytes); if (temp < rbytes) { - code = (callp->error < 0) ? callp->error : -1; + code = (rxcallp->error < 0) ? rxcallp->error : -1; break; } @@ -1669,9 +1669,9 @@ long cm_GetBuffer(cm_scache_t *scp, cm_buf_t *bufp, int *cpffp, cm_user_t *userp if (code == 0) { if (SERVERHAS64BIT(connp)) - code = EndRXAFS_FetchData64(callp, &afsStatus, &callback, &volSync); + code = EndRXAFS_FetchData64(rxcallp, &afsStatus, &callback, &volSync); else - code = EndRXAFS_FetchData(callp, &afsStatus, &callback, &volSync); + code = EndRXAFS_FetchData(rxcallp, &afsStatus, &callback, &volSync); } else { if (SERVERHAS64BIT(connp)) osi_Log1(afsd_logp, "CALL EndRXAFS_FetchData64 skipped due to error %d", code); @@ -1679,8 +1679,8 @@ long cm_GetBuffer(cm_scache_t *scp, cm_buf_t *bufp, int *cpffp, cm_user_t *userp osi_Log1(afsd_logp, "CALL EndRXAFS_FetchData skipped due to error %d", code); } - if (callp) - code = rx_EndCall(callp, code); + if (rxcallp) + code = rx_EndCall(rxcallp, code); if (code == RXKADUNKNOWNKEY) osi_Log0(afsd_logp, "CALL EndCall returns RXKADUNKNOWNKEY"); diff --git a/src/WINNT/afsd/cm_ioctl.c b/src/WINNT/afsd/cm_ioctl.c index 78eaf70fa..63cd4f218 100644 --- a/src/WINNT/afsd/cm_ioctl.c +++ b/src/WINNT/afsd/cm_ioctl.c @@ -381,7 +381,7 @@ cm_IoctlGetACL(cm_ioctl_t *ioctlp, cm_user_t *userp, cm_scache_t *scp, cm_req_t AFSVolSync volSync; AFSFid afid; int tlen; - struct rx_connection * callp; + struct rx_connection * rxconnp; /* now make the get acl call */ #ifdef AFS_FREELANCE_CLIENT @@ -401,9 +401,9 @@ cm_IoctlGetACL(cm_ioctl_t *ioctlp, cm_user_t *userp, cm_scache_t *scp, cm_req_t if (code) continue; - callp = cm_GetRxConn(connp); - code = RXAFS_FetchACL(callp, &afid, &acl, &fileStatus, &volSync); - rx_PutConnection(callp); + rxconnp = cm_GetRxConn(connp); + code = RXAFS_FetchACL(rxconnp, &afid, &acl, &fileStatus, &volSync); + rx_PutConnection(rxconnp); } while (cm_Analyze(connp, userp, reqp, &scp->fid, &volSync, NULL, NULL, code)); code = cm_MapRPCError(code, reqp); @@ -474,7 +474,7 @@ cm_IoctlSetACL(struct cm_ioctl *ioctlp, struct cm_user *userp, cm_scache_t *scp, AFSFetchStatus fileStatus; AFSVolSync volSync; AFSFid fid; - struct rx_connection * callp; + struct rx_connection * rxconnp; #ifdef AFS_FREELANCE_CLIENT if ( scp->fid.cell == AFS_FAKE_ROOT_CELL_ID && scp->fid.volume == AFS_FAKE_ROOT_VOL_ID ) { @@ -493,9 +493,9 @@ cm_IoctlSetACL(struct cm_ioctl *ioctlp, struct cm_user *userp, cm_scache_t *scp, if (code) continue; - callp = cm_GetRxConn(connp); - code = RXAFS_StoreACL(callp, &fid, &acl, &fileStatus, &volSync); - rx_PutConnection(callp); + rxconnp = cm_GetRxConn(connp); + code = RXAFS_StoreACL(rxconnp, &fid, &acl, &fileStatus, &volSync); + rx_PutConnection(rxconnp); } while (cm_Analyze(connp, userp, reqp, &scp->fid, &volSync, NULL, NULL, code)); code = cm_MapRPCError(code, reqp); @@ -607,7 +607,7 @@ cm_IoctlSetVolumeStatus(struct cm_ioctl *ioctlp, struct cm_user *userp, cm_scach cm_cell_t *cellp; char *cp; clientchar_t *strp; - struct rx_connection * callp; + struct rx_connection * rxconnp; #ifdef AFS_FREELANCE_CLIENT if ( scp->fid.cell == AFS_FAKE_ROOT_CELL_ID && scp->fid.volume == AFS_FAKE_ROOT_VOL_ID ) { @@ -661,10 +661,10 @@ cm_IoctlSetVolumeStatus(struct cm_ioctl *ioctlp, struct cm_user *userp, cm_scach if (code) continue; - callp = cm_GetRxConn(tcp); - code = RXAFS_SetVolumeStatus(callp, scp->fid.volume, + rxconnp = cm_GetRxConn(tcp); + code = RXAFS_SetVolumeStatus(rxconnp, scp->fid.volume, &storeStat, volName, offLineMsg, motd); - rx_PutConnection(callp); + rx_PutConnection(rxconnp); } while (cm_Analyze(tcp, userp, reqp, &scp->fid, NULL, NULL, NULL, code)); code = cm_MapRPCError(code, reqp); @@ -714,7 +714,7 @@ cm_IoctlGetVolumeStatus(struct cm_ioctl *ioctlp, struct cm_user *userp, cm_scach char *Name; char *OfflineMsg; char *MOTD; - struct rx_connection * callp; + struct rx_connection * rxconnp; #ifdef AFS_FREELANCE_CLIENT if ( scp->fid.cell == AFS_FAKE_ROOT_CELL_ID && scp->fid.volume == AFS_FAKE_ROOT_VOL_ID ) { @@ -737,10 +737,10 @@ cm_IoctlGetVolumeStatus(struct cm_ioctl *ioctlp, struct cm_user *userp, cm_scach code = cm_ConnFromFID(&scp->fid, userp, reqp, &connp); if (code) continue; - callp = cm_GetRxConn(connp); - code = RXAFS_GetVolumeStatus(callp, scp->fid.volume, + rxconnp = cm_GetRxConn(connp); + code = RXAFS_GetVolumeStatus(rxconnp, scp->fid.volume, &volStat, &Name, &OfflineMsg, &MOTD); - rx_PutConnection(callp); + rx_PutConnection(rxconnp); } while (cm_Analyze(connp, userp, reqp, &scp->fid, NULL, NULL, NULL, code)); code = cm_MapRPCError(code, reqp); diff --git a/src/WINNT/afsd/cm_vnodeops.c b/src/WINNT/afsd/cm_vnodeops.c index db1510137..d6b6883c6 100644 --- a/src/WINNT/afsd/cm_vnodeops.c +++ b/src/WINNT/afsd/cm_vnodeops.c @@ -1492,7 +1492,7 @@ long cm_Unlink(cm_scache_t *dscp, fschar_t *fnamep, clientchar_t * cnamep, int sflags; AFSFetchStatus newDirStatus; AFSVolSync volSync; - struct rx_connection * callp; + struct rx_connection * rxconnp; cm_dirOp_t dirop; cm_scache_t *scp = NULL; int free_fnamep = FALSE; @@ -1545,10 +1545,10 @@ long cm_Unlink(cm_scache_t *dscp, fschar_t *fnamep, clientchar_t * cnamep, if (code) continue; - callp = cm_GetRxConn(connp); - code = RXAFS_RemoveFile(callp, &afsFid, fnamep, + rxconnp = cm_GetRxConn(connp); + code = RXAFS_RemoveFile(rxconnp, &afsFid, fnamep, &newDirStatus, &volSync); - rx_PutConnection(callp); + rx_PutConnection(rxconnp); } while (cm_Analyze(connp, userp, reqp, &dscp->fid, &volSync, NULL, NULL, code)); code = cm_MapRPCError(code, reqp); @@ -2230,7 +2230,7 @@ cm_TryBulkStatRPC(cm_scache_t *dscp, cm_bulkStat_t *bbp, cm_user_t *userp, cm_re long j; cm_scache_t *scp; cm_fid_t tfid; - struct rx_connection * callp; + struct rx_connection * rxconnp; int inlinebulk = 0; /* Did we use InlineBulkStatus RPC or not? */ /* otherwise, we may have one or more bulk stat's worth of stuff in bb; @@ -2255,9 +2255,9 @@ cm_TryBulkStatRPC(cm_scache_t *dscp, cm_bulkStat_t *bbp, cm_user_t *userp, cm_re if (code) continue; - callp = cm_GetRxConn(connp); + rxconnp = cm_GetRxConn(connp); if (!(connp->serverp->flags & CM_SERVERFLAG_NOINLINEBULK)) { - code = RXAFS_InlineBulkStatus(callp, &fidStruct, + code = RXAFS_InlineBulkStatus(rxconnp, &fidStruct, &statStruct, &callbackStruct, &volSync); if (code == RXGEN_OPCODE) { cm_SetServerNoInlineBulk(connp->serverp, 0); @@ -2266,10 +2266,10 @@ cm_TryBulkStatRPC(cm_scache_t *dscp, cm_bulkStat_t *bbp, cm_user_t *userp, cm_re } } if (!inlinebulk) { - code = RXAFS_BulkStatus(callp, &fidStruct, + code = RXAFS_BulkStatus(rxconnp, &fidStruct, &statStruct, &callbackStruct, &volSync); } - rx_PutConnection(callp); + rx_PutConnection(rxconnp); } while (cm_Analyze(connp, userp, reqp, &dscp->fid, &volSync, NULL, &cbReq, code)); @@ -2526,7 +2526,7 @@ long cm_SetAttr(cm_scache_t *scp, cm_attr_t *attrp, cm_user_t *userp, cm_conn_t *connp; AFSFid tfid; AFSStoreStatus afsInStatus; - struct rx_connection * callp; + struct rx_connection * rxconnp; /* handle file length setting */ if (attrp->mask & CM_ATTRMASK_LENGTH) @@ -2556,10 +2556,10 @@ long cm_SetAttr(cm_scache_t *scp, cm_attr_t *attrp, cm_user_t *userp, if (code) continue; - callp = cm_GetRxConn(connp); - code = RXAFS_StoreStatus(callp, &tfid, + rxconnp = cm_GetRxConn(connp); + code = RXAFS_StoreStatus(rxconnp, &tfid, &afsInStatus, &afsOutStatus, &volSync); - rx_PutConnection(callp); + rx_PutConnection(rxconnp); } while (cm_Analyze(connp, userp, reqp, &scp->fid, &volSync, NULL, NULL, code)); @@ -2601,7 +2601,7 @@ long cm_Create(cm_scache_t *dscp, clientchar_t *cnamep, long flags, cm_attr_t *a AFSFetchStatus newFileStatus; AFSCallBack newFileCallback; AFSVolSync volSync; - struct rx_connection * callp; + struct rx_connection * rxconnp; cm_dirOp_t dirop; fschar_t * fnamep = NULL; @@ -2655,12 +2655,12 @@ long cm_Create(cm_scache_t *dscp, clientchar_t *cnamep, long flags, cm_attr_t *a dirAFSFid.Vnode = dscp->fid.vnode; dirAFSFid.Unique = dscp->fid.unique; - callp = cm_GetRxConn(connp); - code = RXAFS_CreateFile(connp->callp, &dirAFSFid, fnamep, + rxconnp = cm_GetRxConn(connp); + code = RXAFS_CreateFile(connp->rxconnp, &dirAFSFid, fnamep, &inStatus, &newAFSFid, &newFileStatus, &updatedDirStatus, &newFileCallback, &volSync); - rx_PutConnection(callp); + rx_PutConnection(rxconnp); } while (cm_Analyze(connp, userp, reqp, &dscp->fid, &volSync, NULL, &cbReq, code)); @@ -2762,7 +2762,7 @@ long cm_MakeDir(cm_scache_t *dscp, clientchar_t *cnamep, long flags, cm_attr_t * AFSFetchStatus newDirStatus; AFSCallBack newDirCallback; AFSVolSync volSync; - struct rx_connection * callp; + struct rx_connection * rxconnp; cm_dirOp_t dirop; fschar_t * fnamep = NULL; @@ -2815,12 +2815,12 @@ long cm_MakeDir(cm_scache_t *dscp, clientchar_t *cnamep, long flags, cm_attr_t * dirAFSFid.Vnode = dscp->fid.vnode; dirAFSFid.Unique = dscp->fid.unique; - callp = cm_GetRxConn(connp); - code = RXAFS_MakeDir(connp->callp, &dirAFSFid, fnamep, + rxconnp = cm_GetRxConn(connp); + code = RXAFS_MakeDir(connp->rxconnp, &dirAFSFid, fnamep, &inStatus, &newAFSFid, &newDirStatus, &updatedDirStatus, &newDirCallback, &volSync); - rx_PutConnection(callp); + rx_PutConnection(rxconnp); } while (cm_Analyze(connp, userp, reqp, &dscp->fid, &volSync, NULL, &cbReq, code)); @@ -2892,7 +2892,7 @@ long cm_Link(cm_scache_t *dscp, clientchar_t *cnamep, cm_scache_t *sscp, long fl AFSFetchStatus updatedDirStatus; AFSFetchStatus newLinkStatus; AFSVolSync volSync; - struct rx_connection * callp; + struct rx_connection * rxconnp; cm_dirOp_t dirop; fschar_t * fnamep = NULL; @@ -2927,10 +2927,10 @@ long cm_Link(cm_scache_t *dscp, clientchar_t *cnamep, cm_scache_t *sscp, long fl existingAFSFid.Vnode = sscp->fid.vnode; existingAFSFid.Unique = sscp->fid.unique; - callp = cm_GetRxConn(connp); - code = RXAFS_Link(callp, &dirAFSFid, fnamep, &existingAFSFid, + rxconnp = cm_GetRxConn(connp); + code = RXAFS_Link(rxconnp, &dirAFSFid, fnamep, &existingAFSFid, &newLinkStatus, &updatedDirStatus, &volSync); - rx_PutConnection(callp); + rx_PutConnection(rxconnp); osi_Log1(afsd_logp," RXAFS_Link returns 0x%x", code); } while (cm_Analyze(connp, userp, reqp, @@ -2982,7 +2982,7 @@ long cm_SymLink(cm_scache_t *dscp, clientchar_t *cnamep, fschar_t *contentsp, lo AFSFetchStatus updatedDirStatus; AFSFetchStatus newLinkStatus; AFSVolSync volSync; - struct rx_connection * callp; + struct rx_connection * rxconnp; cm_dirOp_t dirop; fschar_t *fnamep = NULL; @@ -3015,11 +3015,11 @@ long cm_SymLink(cm_scache_t *dscp, clientchar_t *cnamep, fschar_t *contentsp, lo dirAFSFid.Vnode = dscp->fid.vnode; dirAFSFid.Unique = dscp->fid.unique; - callp = cm_GetRxConn(connp); - code = RXAFS_Symlink(callp, &dirAFSFid, fnamep, contentsp, + rxconnp = cm_GetRxConn(connp); + code = RXAFS_Symlink(rxconnp, &dirAFSFid, fnamep, contentsp, &inStatus, &newAFSFid, &newLinkStatus, &updatedDirStatus, &volSync); - rx_PutConnection(callp); + rx_PutConnection(rxconnp); } while (cm_Analyze(connp, userp, reqp, &dscp->fid, &volSync, NULL, NULL, code)); @@ -3105,7 +3105,7 @@ long cm_RemoveDir(cm_scache_t *dscp, fschar_t *fnamep, clientchar_t *cnamep, cm_ int didEnd; AFSFetchStatus updatedDirStatus; AFSVolSync volSync; - struct rx_connection * callp; + struct rx_connection * rxconnp; cm_dirOp_t dirop; cm_scache_t *scp = NULL; int free_fnamep = FALSE; @@ -3154,10 +3154,10 @@ long cm_RemoveDir(cm_scache_t *dscp, fschar_t *fnamep, clientchar_t *cnamep, cm_ dirAFSFid.Vnode = dscp->fid.vnode; dirAFSFid.Unique = dscp->fid.unique; - callp = cm_GetRxConn(connp); - code = RXAFS_RemoveDir(callp, &dirAFSFid, fnamep, + rxconnp = cm_GetRxConn(connp); + code = RXAFS_RemoveDir(rxconnp, &dirAFSFid, fnamep, &updatedDirStatus, &volSync); - rx_PutConnection(callp); + rx_PutConnection(rxconnp); } while (cm_Analyze(connp, userp, reqp, &dscp->fid, &volSync, NULL, NULL, code)); @@ -3262,7 +3262,7 @@ long cm_Rename(cm_scache_t *oldDscp, fschar_t *oldNamep, clientchar_t *cOldNamep AFSFetchStatus updatedNewDirStatus; AFSVolSync volSync; int oneDir; - struct rx_connection * callp; + struct rx_connection * rxconnp; cm_dirOp_t oldDirOp; cm_fid_t fileFid; int diropCode = -1; @@ -3409,12 +3409,12 @@ long cm_Rename(cm_scache_t *oldDscp, fschar_t *oldNamep, clientchar_t *cOldNamep newDirAFSFid.Vnode = newDscp->fid.vnode; newDirAFSFid.Unique = newDscp->fid.unique; - callp = cm_GetRxConn(connp); - code = RXAFS_Rename(callp, &oldDirAFSFid, oldNamep, + rxconnp = cm_GetRxConn(connp); + code = RXAFS_Rename(rxconnp, &oldDirAFSFid, oldNamep, &newDirAFSFid, newNamep, &updatedOldDirStatus, &updatedNewDirStatus, &volSync); - rx_PutConnection(callp); + rx_PutConnection(rxconnp); } while (cm_Analyze(connp, userp, reqp, &oldDscp->fid, &volSync, NULL, NULL, code)); @@ -4022,7 +4022,7 @@ long cm_IntSetLock(cm_scache_t * scp, cm_user_t * userp, int lockType, AFSFid tfid; cm_fid_t cfid; cm_conn_t * connp; - struct rx_connection * callp; + struct rx_connection * rxconnp; AFSVolSync volSync; afs_uint32 reqflags = reqp->flags; @@ -4041,10 +4041,10 @@ long cm_IntSetLock(cm_scache_t * scp, cm_user_t * userp, int lockType, if (code) break; - callp = cm_GetRxConn(connp); - code = RXAFS_SetLock(callp, &tfid, lockType, + rxconnp = cm_GetRxConn(connp); + code = RXAFS_SetLock(rxconnp, &tfid, lockType, &volSync); - rx_PutConnection(callp); + rx_PutConnection(rxconnp); } while (cm_Analyze(connp, userp, reqp, &cfid, &volSync, NULL, NULL, code)); @@ -4068,7 +4068,7 @@ long cm_IntReleaseLock(cm_scache_t * scp, cm_user_t * userp, AFSFid tfid; cm_fid_t cfid; cm_conn_t * connp; - struct rx_connection * callp; + struct rx_connection * rxconnp; AFSVolSync volSync; tfid.Volume = scp->fid.volume; @@ -4085,9 +4085,9 @@ long cm_IntReleaseLock(cm_scache_t * scp, cm_user_t * userp, if (code) break; - callp = cm_GetRxConn(connp); - code = RXAFS_ReleaseLock(callp, &tfid, &volSync); - rx_PutConnection(callp); + rxconnp = cm_GetRxConn(connp); + code = RXAFS_ReleaseLock(rxconnp, &tfid, &volSync); + rx_PutConnection(rxconnp); } while (cm_Analyze(connp, userp, reqp, &cfid, &volSync, NULL, NULL, code)); @@ -4977,7 +4977,7 @@ void cm_CheckLocks() AFSVolSync volSync; cm_conn_t *connp; long code; - struct rx_connection * callp; + struct rx_connection * rxconnp; cm_scache_t * scp; cm_InitReq(&req); @@ -5079,10 +5079,10 @@ void cm_CheckLocks() if (code) break; - callp = cm_GetRxConn(connp); - code = RXAFS_ExtendLock(callp, &tfid, + rxconnp = cm_GetRxConn(connp); + code = RXAFS_ExtendLock(rxconnp, &tfid, &volSync); - rx_PutConnection(callp); + rx_PutConnection(rxconnp); osi_Log1(afsd_logp, " ExtendLock returns %d", code); diff --git a/src/WINNT/afsd/cm_volume.c b/src/WINNT/afsd/cm_volume.c index c67b21c6d..81f032307 100644 --- a/src/WINNT/afsd/cm_volume.c +++ b/src/WINNT/afsd/cm_volume.c @@ -1075,7 +1075,7 @@ cm_CheckOfflineVolume(cm_volume_t *volp, afs_uint32 volID) char *OfflineMsg; char *MOTD; cm_req_t req; - struct rx_connection * callp; + struct rx_connection * rxconnp; char volName[32]; char offLineMsg[256]; char motd[256]; @@ -1112,10 +1112,10 @@ cm_CheckOfflineVolume(cm_volume_t *volp, afs_uint32 volID) if (code) continue; - callp = cm_GetRxConn(connp); - code = RXAFS_GetVolumeStatus(callp, volp->vol[RWVOL].ID, + rxconnp = cm_GetRxConn(connp); + code = RXAFS_GetVolumeStatus(rxconnp, volp->vol[RWVOL].ID, &volStat, &Name, &OfflineMsg, &MOTD); - rx_PutConnection(callp); + rx_PutConnection(rxconnp); } while (cm_Analyze(connp, cm_rootUserp, &req, NULL, NULL, NULL, NULL, code)); code = cm_MapRPCError(code, &req); @@ -1152,10 +1152,10 @@ cm_CheckOfflineVolume(cm_volume_t *volp, afs_uint32 volID) if (code) continue; - callp = cm_GetRxConn(connp); - code = RXAFS_GetVolumeStatus(callp, volp->vol[ROVOL].ID, + rxconnp = cm_GetRxConn(connp); + code = RXAFS_GetVolumeStatus(rxconnp, volp->vol[ROVOL].ID, &volStat, &Name, &OfflineMsg, &MOTD); - rx_PutConnection(callp); + rx_PutConnection(rxconnp); } while (cm_Analyze(connp, cm_rootUserp, &req, NULL, NULL, NULL, NULL, code)); code = cm_MapRPCError(code, &req); @@ -1192,10 +1192,10 @@ cm_CheckOfflineVolume(cm_volume_t *volp, afs_uint32 volID) if (code) continue; - callp = cm_GetRxConn(connp); - code = RXAFS_GetVolumeStatus(callp, volp->vol[BACKVOL].ID, + rxconnp = cm_GetRxConn(connp); + code = RXAFS_GetVolumeStatus(rxconnp, volp->vol[BACKVOL].ID, &volStat, &Name, &OfflineMsg, &MOTD); - rx_PutConnection(callp); + rx_PutConnection(rxconnp); } while (cm_Analyze(connp, cm_rootUserp, &req, NULL, NULL, NULL, NULL, code)); code = cm_MapRPCError(code, &req); -- 2.39.5