Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-04-22 08:23:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

sys: IRP_MJ_READ: remove FspFileNodeTrySetFileInfo at completion

Browse Source 
sys: IRP_MJ_READ: remove PagingIo early exit optimization
sys: IRP_MJ_WRITE: remove PagingIo early exit optimization
This commit is contained in:
Bill Zissimopoulos 2016-04-13 20:33:10 -07:00
parent 41296044e6
commit 1239c610a5
6 changed files with 4 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/winfsp/fsctl.h
View File

@ -321,10 +321,6 @@ typedef struct
FSP_FSCTL_FILE_INFO FileInfo;
} Overwrite;
struct
{
FSP_FSCTL_FILE_INFO FileInfo;
} Read;
struct
{
FSP_FSCTL_FILE_INFO FileInfo;
} Write;

2
inc/winfsp/winfsp.h
View File

@ -67,7 +67,7 @@ typedef struct _FSP_FILE_SYSTEM_INTERFACE
NTSTATUS (*Read)(FSP_FILE_SYSTEM *FileSystem,
FSP_FSCTL_TRANSACT_REQ *Request,
PVOID FileNode, PVOID Buffer, UINT64 Offset, ULONG Length,
PULONG PBytesTransferred, FSP_FSCTL_FILE_INFO *FileInfo);
PULONG PBytesTransferred);
NTSTATUS (*Write)(FSP_FILE_SYSTEM *FileSystem,
FSP_FSCTL_TRANSACT_REQ *Request,
PVOID FileNode, PVOID Buffer, UINT64 Offset, ULONG Length,

7
src/dll/fsop.c
View File

@ -407,7 +407,6 @@ FSP_API NTSTATUS FspFileSystemOpRead(FSP_FILE_SYSTEM *FileSystem,
{
NTSTATUS Result;
ULONG BytesTransferred;
FSP_FSCTL_FILE_INFO FileInfo;
if (0 == FileSystem->Interface->Read)
return STATUS_INVALID_DEVICE_REQUEST;
@ -418,16 +417,12 @@ FSP_API NTSTATUS FspFileSystemOpRead(FSP_FILE_SYSTEM *FileSystem,
(PVOID)Request->Req.Read.Address,
Request->Req.Read.Offset,
Request->Req.Read.Length,
&BytesTransferred,
&FileInfo);
&BytesTransferred);
if (!NT_SUCCESS(Result))
return Result;
if (STATUS_PENDING != Result)
{
Response->IoStatus.Information = BytesTransferred;
memcpy(&Response->Rsp.Read.FileInfo, &FileInfo, sizeof FileInfo);
}
return Result;
}

38
src/sys/read.c
View File

@ -36,9 +36,6 @@ enum
RequestSafeMdl = 1,
RequestAddress = 2,
RequestProcess = 3,
/* ReadNonCachedComplete retry */
RequestInfoChangeNumber = 0,
};
static NTSTATUS FspFsvolRead(
@ -210,7 +207,6 @@ static NTSTATUS FspFsvolReadNonCached(
ULONG ReadLength = IrpSp->Parameters.Read.Length;
ULONG ReadKey = IrpSp->Parameters.Read.Key;
BOOLEAN PagingIo = BooleanFlagOn(Irp->Flags, IRP_PAGING_IO);
FSP_FSCTL_FILE_INFO FileInfo;
FSP_FSCTL_TRANSACT_REQ *Request;
BOOLEAN Success;
@ -220,13 +216,6 @@ static NTSTATUS FspFsvolReadNonCached(
if (FlagOn(IrpSp->MinorFunction, IRP_MN_MDL))
return STATUS_INVALID_PARAMETER;
/* 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 */
Result = FspLockUserBuffer(Irp, ReadLength, IoWriteAccess);
if (!NT_SUCCESS(Result))
@ -348,12 +337,9 @@ NTSTATUS FspFsvolReadComplete(
FSP_FSCTL_TRANSACT_REQ *Request = FspIrpRequest(Irp);
FSP_SAFE_MDL *SafeMdl = FspIopRequestContext(Request, RequestSafeMdl);
PFILE_OBJECT FileObject = IrpSp->FileObject;
FSP_FILE_NODE *FileNode = FileObject->FsContext;
LARGE_INTEGER ReadOffset = IrpSp->Parameters.Read.ByteOffset;
BOOLEAN PagingIo = BooleanFlagOn(Irp->Flags, IRP_PAGING_IO);
BOOLEAN SynchronousIo = BooleanFlagOn(FileObject->Flags, FO_SYNCHRONOUS_IO);
ULONG InfoChangeNumber;
BOOLEAN Success;
if (0 != SafeMdl)
FspSafeMdlCopyBack(SafeMdl);
@ -361,34 +347,12 @@ NTSTATUS FspFsvolReadComplete(
/* if we are top-level */
if (0 == FspIrpTopFlags(Irp))
{
if (FspFsctlTransactReadKind == Request->Kind)
{
InfoChangeNumber = FileNode->InfoChangeNumber;
Request->Kind = FspFsctlTransactReservedKind;
FspIopResetRequest(Request, 0);
FspIopRequestContext(Request, RequestInfoChangeNumber) = (PVOID)InfoChangeNumber;
}
else
InfoChangeNumber =
(ULONG)(UINT_PTR)FspIopRequestContext(Request, RequestInfoChangeNumber);
Success = DEBUGTEST(90) && FspFileNodeTryAcquireExclusive(FileNode, Main);
if (!Success)
{
FspIopRetryCompleteIrp(Irp, Response, &Result);
FSP_RETURN();
}
/* update file info */
FspFileNodeTrySetFileInfo(FileNode, FileObject, &Response->Rsp.Read.FileInfo,
InfoChangeNumber);
/* update the current file offset if synchronous I/O (and not paging I/O) */
if (SynchronousIo && !PagingIo)
FileObject->CurrentByteOffset.QuadPart =
ReadOffset.QuadPart + Response->IoStatus.Information;
FspFileNodeRelease(FileNode, Main);
FspIopResetRequest(Request, 0);
}
else
{

8
src/sys/write.c
View File

@ -258,7 +258,6 @@ static NTSTATUS FspFsvolWriteNonCached(
BOOLEAN WriteToEndOfFile =
FILE_WRITE_TO_END_OF_FILE == WriteOffset.LowPart && -1L == WriteOffset.HighPart;
BOOLEAN PagingIo = BooleanFlagOn(Irp->Flags, IRP_PAGING_IO);
FSP_FSCTL_FILE_INFO FileInfo;
FSP_FSCTL_TRANSACT_REQ *Request;
BOOLEAN Success;
@ -276,13 +275,6 @@ static NTSTATUS FspFsvolWriteNonCached(
if (FspIoqStopped(FspFsvolDeviceExtension(FsvolDeviceObject)->Ioq))
return FspFsvolDeviceStoppedStatus(FsvolDeviceObject);
/* 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);
if (!NT_SUCCESS(Result))

3
tst/memfs/memfs.cpp
View File

@ -460,7 +460,7 @@ static VOID Close(FSP_FILE_SYSTEM *FileSystem,
static NTSTATUS Read(FSP_FILE_SYSTEM *FileSystem,
FSP_FSCTL_TRANSACT_REQ *Request,
PVOID FileNode0, PVOID Buffer, UINT64 Offset, ULONG Length,
PULONG PBytesTransferred, FSP_FSCTL_FILE_INFO *FileInfo)
PULONG PBytesTransferred)
{
MEMFS_FILE_NODE *FileNode = (MEMFS_FILE_NODE *)FileNode0;
UINT64 EndOffset;
@ -475,7 +475,6 @@ static NTSTATUS Read(FSP_FILE_SYSTEM *FileSystem,
memcpy(Buffer, (PUINT8)FileNode->FileData + Offset, EndOffset - Offset);
*PBytesTransferred = (ULONG)(EndOffset - Offset);
*FileInfo = FileNode->FileInfo;
return STATUS_SUCCESS;
}