Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-10-31 12:08:41 -05:00
Code Activity

sys: IRP_MJ_READ, IRP_MJ_WRITE: fix paging I/O sizes

Browse Source
This commit is contained in:
Bill Zissimopoulos
2016-04-13 18:00:02 -07:00
parent 49f9f13806
commit 41296044e6
6 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/sys/read.c
View File

@@ -220,10 +220,11 @@ static NTSTATUS FspFsvolReadNonCached(
if (FlagOn(IrpSp->MinorFunction, IRP_MN_MDL))
return STATUS_INVALID_PARAMETER;
/* if this is a recursive read (cache) see if we can optimize it away! */
if (FlagOn(FspIrpTopFlags(Irp), FspFileNodeAcquireMain) && /* if TopLevelIrp has acquired Main */
FspFileNodeTryGetFileInfo(FileNode, &FileInfo) && /* and the cached FileSize is valid */
(UINT64)ReadOffset.QuadPart >= FileInfo.FileSize) /* and the ReadOffset is past EOF */
/* if this is a Paging I/O see if we can optimize it away! */
if (PagingIo && /* if this is Paging I/O */
FlagOn(FspIrpTopFlags(Irp), FspFileNodeAcquireMain) && /* and TopLevelIrp has acquired Main */
FspFileNodeTryGetFileInfo(FileNode, &FileInfo) && /* and the cached FileSize is valid */
(UINT64)ReadOffset.QuadPart >= FileInfo.FileSize) /* and the ReadOffset is past EOF */
return STATUS_END_OF_FILE;
/* probe and lock the user buffer */

23
src/sys/write.c
View File

@@ -276,22 +276,12 @@ static NTSTATUS FspFsvolWriteNonCached(
if (FspIoqStopped(FspFsvolDeviceExtension(FsvolDeviceObject)->Ioq))
return FspFsvolDeviceStoppedStatus(FsvolDeviceObject);
/* if we are called by the lazy writer we must constrain writes */
if (FlagOn(FspIrpTopFlags(Irp), FspFileNodeAcquireMain) && /* if TopLevelIrp has acquired Main */
FileNode->Tls.LazyWriteThread == PsGetCurrentThread()) /* and this is a lazy writer thread */
{
ASSERT(PagingIo);
ASSERT(FspTimeoutInfinity32 ==
FspFsvolDeviceExtension(FsvolDeviceObject)->VolumeParams.FileInfoTimeout);
FspFileNodeGetFileInfo(FileNode, &FileInfo);
if ((UINT64)WriteOffset.QuadPart >= FileInfo.FileSize)
return STATUS_SUCCESS;
if (WriteLength > (ULONG)(FileInfo.FileSize - WriteOffset.QuadPart))
WriteLength = (ULONG)(FileInfo.FileSize - WriteOffset.QuadPart);
}
/* if this is a Paging I/O see if we can optimize it away! */
if (PagingIo && /* if this is Paging I/O */
FlagOn(FspIrpTopFlags(Irp), FspFileNodeAcquireMain) && /* and TopLevelIrp has acquired Main */
FspFileNodeTryGetFileInfo(FileNode, &FileInfo) && /* and the cached FileSize is valid */
(UINT64)WriteOffset.QuadPart >= FileInfo.FileSize) /* and the WriteOffset is past EOF */
return STATUS_SUCCESS;
/* probe and lock the user buffer */
Result = FspLockUserBuffer(Irp, WriteLength, IoReadAccess);
@@ -348,6 +338,7 @@ static NTSTATUS FspFsvolWriteNonCached(
Request->Req.Write.Offset = WriteOffset.QuadPart;
Request->Req.Write.Length = WriteLength;
Request->Req.Write.Key = WriteKey;
Request->Req.Write.ConstrainedIo = !!PagingIo;
FspFileNodeSetOwner(FileNode, Full, Request);
FspIopRequestContext(Request, RequestIrp) = Irp;