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

sys: FspIrpDeleteRequest

Browse Source
This commit is contained in:
Bill Zissimopoulos 2016-04-06 13:40:32 -07:00
parent f7a739381c
commit b729500d7b
6 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sys/dirctl.c
View File

@ -424,7 +424,7 @@ static NTSTATUS FspFsvolQueryDirectoryRetry(
/* if we have been retried reset our work item now! */ /* if we have been retried reset our work item now! */
if (0 != Request) if (0 != Request)
{ {
FspWqDeleteIrpWorkItem(Irp); FspIrpDeleteRequest(Irp);
Request = 0; Request = 0;
} }

11
src/sys/driver.h
View File

@ -643,6 +643,16 @@ BOOLEAN FspIopRetryCompleteIrp(PIRP Irp, const FSP_FSCTL_TRANSACT_RSP *Response,
FSP_FSCTL_TRANSACT_RSP *FspIopIrpResponse(PIRP Irp); FSP_FSCTL_TRANSACT_RSP *FspIopIrpResponse(PIRP Irp);
NTSTATUS FspIopDispatchPrepare(PIRP Irp, FSP_FSCTL_TRANSACT_REQ *Request); NTSTATUS FspIopDispatchPrepare(PIRP Irp, FSP_FSCTL_TRANSACT_REQ *Request);
NTSTATUS FspIopDispatchComplete(PIRP Irp, const FSP_FSCTL_TRANSACT_RSP *Response); NTSTATUS FspIopDispatchComplete(PIRP Irp, const FSP_FSCTL_TRANSACT_RSP *Response);
static inline
VOID FspIrpDeleteRequest(PIRP Irp)
{
FSP_FSCTL_TRANSACT_REQ *Request = FspIrpRequest(Irp);
if (0 != Request)
{
FspIopDeleteRequest(Request);
FspIrpSetRequest(Irp, 0);
}
}
/* work queue processing */ /* work queue processing */
enum enum
@ -655,7 +665,6 @@ typedef NTSTATUS FSP_WQ_REQUEST_WORK(
NTSTATUS FspWqCreateAndPostIrpWorkItem(PIRP Irp, NTSTATUS FspWqCreateAndPostIrpWorkItem(PIRP Irp,
FSP_WQ_REQUEST_WORK *WorkRoutine, FSP_IOP_REQUEST_FINI *RequestFini, FSP_WQ_REQUEST_WORK *WorkRoutine, FSP_IOP_REQUEST_FINI *RequestFini,
BOOLEAN CreateAndPost); BOOLEAN CreateAndPost);
VOID FspWqDeleteIrpWorkItem(PIRP Irp);
VOID FspWqPostIrpWorkItem(PIRP Irp); VOID FspWqPostIrpWorkItem(PIRP Irp);
#define FspWqCreateIrpWorkItem(I, RW, RF)\ #define FspWqCreateIrpWorkItem(I, RW, RF)\
FspWqCreateAndPostIrpWorkItem(I, RW, RF, FALSE) FspWqCreateAndPostIrpWorkItem(I, RW, RF, FALSE)

3
src/sys/iop.c
View File

@ -95,7 +95,10 @@ NTSTATUS FspIopCreateRequestFunnel(
} }
if (0 != Irp) if (0 != Irp)
{
ASSERT(0 == FspIrpRequest(Irp));
FspIrpSetRequest(Irp, Request); FspIrpSetRequest(Irp, Request);
}
*PRequest = Request; *PRequest = Request;
return STATUS_SUCCESS; return STATUS_SUCCESS;

3
src/sys/read.c
View File

@ -257,6 +257,9 @@ static NTSTATUS FspFsvolReadNonCached(
/* convert FileNode to shared */ /* convert FileNode to shared */
FspFileNodeConvertExclusiveToShared(FileNode, Full); FspFileNodeConvertExclusiveToShared(FileNode, Full);
/* delete any work item if present! */
FspIrpDeleteRequest(Irp);
/* create request */ /* create request */
Result = FspIopCreateRequestEx(Irp, 0, 0, FspFsvolReadNonCachedRequestFini, &Request); Result = FspIopCreateRequestEx(Irp, 0, 0, FspFsvolReadNonCachedRequestFini, &Request);
if (!NT_SUCCESS(Result)) if (!NT_SUCCESS(Result))

12
src/sys/wq.c
View File

@ -50,18 +50,6 @@ NTSTATUS FspWqCreateAndPostIrpWorkItem(PIRP Irp,
return STATUS_PENDING; return STATUS_PENDING;
} }
VOID FspWqDeleteIrpWorkItem(PIRP Irp)
{
FSP_FSCTL_TRANSACT_REQ *RequestWorkItem = FspIrpRequest(Irp);
ASSERT(RequestWorkItem->Kind == FspFsctlTransactReservedKind);
ASSERT(RequestWorkItem->Size == sizeof *RequestWorkItem + sizeof(WORK_QUEUE_ITEM));
ASSERT(RequestWorkItem->Hint == (UINT_PTR)Irp);
FspIopDeleteRequest(RequestWorkItem);
FspIrpSetRequest(Irp, 0);
}
VOID FspWqPostIrpWorkItem(PIRP Irp) VOID FspWqPostIrpWorkItem(PIRP Irp)
{ {
FSP_FSCTL_TRANSACT_REQ *RequestWorkItem = FspIrpRequest(Irp); FSP_FSCTL_TRANSACT_REQ *RequestWorkItem = FspIrpRequest(Irp);

3
src/sys/write.c
View File

@ -320,6 +320,9 @@ static NTSTATUS FspFsvolWriteNonCached(
} }
} }
/* delete any work item if present! */
FspIrpDeleteRequest(Irp);
/* create request */ /* create request */
Result = FspIopCreateRequestEx(Irp, 0, 0, FspFsvolWriteNonCachedRequestFini, &Request); Result = FspIopCreateRequestEx(Irp, 0, 0, FspFsvolWriteNonCachedRequestFini, &Request);
if (!NT_SUCCESS(Result)) if (!NT_SUCCESS(Result))