From b63ff1319e0ebecdfbdef7365d49d02543bccce8 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Fri, 16 Dec 2011 16:15:56 -0500 Subject: [PATCH] Windows: Properly convert FID structures Use the FID conversion function in RDR_SetFileStatus(). The FID structures are not the same in afsd_service and the afsredirlib.sys driver. Change-Id: I6360f39c8b90c46d468a06c08f0911f55f9142fb Reviewed-on: http://gerrit.openafs.org/6350 Tested-by: BuildBot Tested-by: Jeffrey Altman Reviewed-by: Jeffrey Altman --- src/WINNT/afsrdr/user/RDRInit.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/WINNT/afsrdr/user/RDRInit.cpp b/src/WINNT/afsrdr/user/RDRInit.cpp index 37a30d810..371f4658c 100644 --- a/src/WINNT/afsrdr/user/RDRInit.cpp +++ b/src/WINNT/afsrdr/user/RDRInit.cpp @@ -1520,15 +1520,14 @@ RDR_SetFileStatus( cm_fid_t *fidp, AFSExtentFailureCB SetFileStatusCB; DWORD bytesReturned; DWORD gle; - AFSFileID *pFileId = (AFSFileID *)fidp; - SetFileStatusCB.FileId = *pFileId; + RDR_fid2FID(fidp, &SetFileStatusCB.FileId); SetFileStatusCB.FailureStatus = dwStatus; if (afsd_logp->enabled) { swprintf( wchBuffer, L"RDR_SetFileStatus IOCTL_AFS_EXTENT_FAILURE_CB Fid %08lX.%08lX.%08lX.%08lX Status 0x%lX", - pFileId->Cell, pFileId->Volume, - pFileId->Vnode, pFileId->Unique, + SetFileStatusCB.FileId.Cell, SetFileStatusCB.FileId.Volume, + SetFileStatusCB.FileId.Vnode, SetFileStatusCB.FileId.Unique, dwStatus); osi_Log1(afsd_logp, "%S", osi_LogSaveStringW(afsd_logp, wchBuffer)); -- 2.39.5