From 1df112db3c06b6d16a027acbfe8739410630c66e Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Tue, 25 Sep 2012 14:31:11 -0400 Subject: [PATCH] Windows: remove reqp param RDR_IoctlWrite/Read The RDR_IoctlWrite and RDR_IoctlRead functions no longer use the cm_req_t parameter so remove it. Change-Id: I1c6f09da9e4a386f79dae1c15b0b2ccdce944d51 Reviewed-on: http://gerrit.openafs.org/8159 Tested-by: BuildBot Reviewed-by: Derrick Brashear Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- src/WINNT/afsrdr/user/RDRFunction.c | 4 ++-- src/WINNT/afsrdr/user/RDRIoctl.c | 6 +++--- src/WINNT/afsrdr/user/RDRIoctl.h | 5 ++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/WINNT/afsrdr/user/RDRFunction.c b/src/WINNT/afsrdr/user/RDRFunction.c index 667c2dc27..d7dd2a2d8 100644 --- a/src/WINNT/afsrdr/user/RDRFunction.c +++ b/src/WINNT/afsrdr/user/RDRFunction.c @@ -4543,7 +4543,7 @@ RDR_PioctlWrite( IN cm_user_t *userp, pResultCB = (AFSPIOCtlIOResultCB *)(*ResultCB)->ResultData; - code = RDR_IoctlWrite(userp, pPioctlCB->RequestId, pPioctlCB->BufferLength, pPioctlCB->MappedBuffer, &req); + code = RDR_IoctlWrite(userp, pPioctlCB->RequestId, pPioctlCB->BufferLength, pPioctlCB->MappedBuffer); if (code) { smb_MapNTError(cm_MapRPCError(code, &req), &status, TRUE); (*ResultCB)->ResultStatus = status; @@ -4583,7 +4583,7 @@ RDR_PioctlRead( IN cm_user_t *userp, pResultCB = (AFSPIOCtlIOResultCB *)(*ResultCB)->ResultData; code = RDR_IoctlRead(userp, pPioctlCB->RequestId, pPioctlCB->BufferLength, pPioctlCB->MappedBuffer, - &pResultCB->BytesProcessed, &req, pflags); + &pResultCB->BytesProcessed, pflags); if (code) { smb_MapNTError(cm_MapRPCError(code, &req), &status, TRUE); (*ResultCB)->ResultStatus = status; diff --git a/src/WINNT/afsrdr/user/RDRIoctl.c b/src/WINNT/afsrdr/user/RDRIoctl.c index 2dad89f04..fc20805f7 100644 --- a/src/WINNT/afsrdr/user/RDRIoctl.c +++ b/src/WINNT/afsrdr/user/RDRIoctl.c @@ -364,7 +364,7 @@ RDR_ReleaseIoctl(RDR_ioctl_t * iop) /* called from RDR_ReceiveCoreRead when we receive a read on the ioctl fid */ afs_int32 -RDR_IoctlRead(cm_user_t *userp, ULONG RequestId, ULONG BufferLength, void *MappedBuffer, ULONG *pBytesProcessed, cm_req_t *reqp, afs_uint32 pflags) +RDR_IoctlRead(cm_user_t *userp, ULONG RequestId, ULONG BufferLength, void *MappedBuffer, ULONG *pBytesProcessed, afs_uint32 pflags) { RDR_ioctl_t *iop; afs_uint32 count; @@ -395,11 +395,11 @@ RDR_IoctlRead(cm_user_t *userp, ULONG RequestId, ULONG BufferLength, void *Mappe return code; } -/* called from RDR_PioctWRite when we receive a write call on the IOCTL +/* called from RDR_PioctWrite when we receive a write call on the IOCTL * file descriptor. */ afs_int32 -RDR_IoctlWrite(cm_user_t *userp, ULONG RequestId, ULONG BufferLength, void *MappedBuffer, cm_req_t *reqp) +RDR_IoctlWrite(cm_user_t *userp, ULONG RequestId, ULONG BufferLength, void *MappedBuffer) { afs_int32 code = 0; RDR_ioctl_t *iop; diff --git a/src/WINNT/afsrdr/user/RDRIoctl.h b/src/WINNT/afsrdr/user/RDRIoctl.h index 3d61546b6..56873650f 100644 --- a/src/WINNT/afsrdr/user/RDRIoctl.h +++ b/src/WINNT/afsrdr/user/RDRIoctl.h @@ -38,10 +38,9 @@ extern void RDR_SetupIoctl(ULONG index, cm_fid_t *parentFid, cm_fid_t *rootFid, extern void RDR_CleanupIoctl(ULONG index); extern afs_int32 RDR_IoctlRead(cm_user_t *userp, ULONG RequestId, ULONG BufferLength, void *MappedBuffer, - ULONG *pBytesProcessed, cm_req_t *reqp, afs_uint32 pflags); + ULONG *pBytesProcessed, afs_uint32 pflags); -extern afs_int32 RDR_IoctlWrite(cm_user_t *userp, ULONG RequestId, ULONG BufferLength, void *MappedBuffer, - cm_req_t *reqp); +extern afs_int32 RDR_IoctlWrite(cm_user_t *userp, ULONG RequestId, ULONG BufferLength, void *MappedBuffer); #ifdef RDR_IOCTL_PRIVATE typedef struct RDR_ioctl { -- 2.39.5