From 564f9fd06777882abd29a0da6274150f5b1e7d7f Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Mon, 14 Apr 2014 16:48:32 -0400 Subject: [PATCH] Windows: AFSCommonWrite add bWriteToEndOfFile var To improve readability add a bWriteToEndOfFile variable which stores the value of liStartingByte.LowPart == FILE_WRITE_TO_END_OF_FILE && liStartingByte.HighPart == -1 Change-Id: I6594196a6c8c3ab41561ffdbd3eddf3d34b410de Reviewed-on: http://gerrit.openafs.org/11068 Tested-by: BuildBot Reviewed-by: Jeffrey Altman --- src/WINNT/afsrdr/kernel/lib/AFSWrite.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/WINNT/afsrdr/kernel/lib/AFSWrite.cpp b/src/WINNT/afsrdr/kernel/lib/AFSWrite.cpp index df3c2e8fb..3fcdbbd6d 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSWrite.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSWrite.cpp @@ -121,6 +121,7 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, BOOLEAN bReleasePaging = FALSE; BOOLEAN bExtendingWrite = FALSE; BOOLEAN bSynchronousFo = FALSE; + BOOLEAN bWriteToEndOfFile = FALSE; BOOLEAN bWait = FALSE; BOOLEAN bCompleteIrp = TRUE; BOOLEAN bForceFlush = FALSE; @@ -547,10 +548,12 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, else { - bExtendingWrite = (((liStartingByte.QuadPart + ulByteCount) >= - pFcb->Header.FileSize.QuadPart) || - (liStartingByte.LowPart == FILE_WRITE_TO_END_OF_FILE && - liStartingByte.HighPart == -1)) ; + bWriteToEndOfFile = liStartingByte.LowPart == FILE_WRITE_TO_END_OF_FILE && + liStartingByte.HighPart == -1; + + bExtendingWrite = ( bWriteToEndOfFile || + ((liStartingByte.QuadPart + ulByteCount) >= + pFcb->Header.FileSize.QuadPart)); if( bExtendingWrite || bNonCachedIo) { @@ -587,8 +590,7 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, bReleaseSectionObject = TRUE; - if (liStartingByte.LowPart == FILE_WRITE_TO_END_OF_FILE && - liStartingByte.HighPart == -1) + if ( bWriteToEndOfFile) { if (pFcb->Header.ValidDataLength.QuadPart > pFcb->Header.FileSize.QuadPart) { -- 2.39.5