sys: rename FspIopCompleteRequest to FspIopCompleteIrp

This commit is contained in:
Bill Zissimopoulos 2015-12-06 18:06:19 -08:00
parent f46f567a56
commit 18025573a3
4 changed files with 11 additions and 11 deletions

View File

@ -119,12 +119,12 @@
{ \ { \
/* this can only happen if the Ioq was stopped */\ /* this can only happen if the Ioq was stopped */\
ASSERT(FspIoqStopped(&FsvrtDeviceExtension->Ioq));\ ASSERT(FspIoqStopped(&FsvrtDeviceExtension->Ioq));\
FspIopCompleteRequest(Irp, Result = STATUS_CANCELLED);\ FspIopCompleteIrp(Irp, Result = STATUS_CANCELLED);\
} \ } \
} \ } \
} \ } \
else \ else \
FspIopCompleteRequestEx(Irp, Result, fsp_device_release);\ FspIopCompleteIrpEx(Irp, Result, fsp_device_release);\
); \ ); \
return Result return Result
#define FSP_ENTER_IOP(...) \ #define FSP_ENTER_IOP(...) \
@ -148,7 +148,7 @@
__VA_ARGS__, \ __VA_ARGS__, \
NtStatusSym(Result), \ NtStatusSym(Result), \
(LONGLONG)Irp->IoStatus.Information);\ (LONGLONG)Irp->IoStatus.Information);\
FspIopCompleteRequest(Irp, Result);\ FspIopCompleteIrp(Irp, Result);\
) )
#define FSP_ENTER_BOOL(...) \ #define FSP_ENTER_BOOL(...) \
BOOLEAN Result = TRUE; FSP_ENTER_(__VA_ARGS__) BOOLEAN Result = TRUE; FSP_ENTER_(__VA_ARGS__)
@ -261,11 +261,11 @@ PIRP FspIoqEndProcessingIrp(FSP_IOQ *Ioq, UINT_PTR IrpHint);
/* I/O processing */ /* I/O processing */
NTSTATUS FspIopCreateRequest( NTSTATUS FspIopCreateRequest(
PIRP Irp, PUNICODE_STRING FileName, ULONG ExtraSize, FSP_FSCTL_TRANSACT_REQ **PRequest); PIRP Irp, PUNICODE_STRING FileName, ULONG ExtraSize, FSP_FSCTL_TRANSACT_REQ **PRequest);
VOID FspIopCompleteRequestEx(PIRP Irp, NTSTATUS Result, BOOLEAN DeviceRelease); VOID FspIopCompleteIrpEx(PIRP Irp, NTSTATUS Result, BOOLEAN DeviceRelease);
static inline static inline
VOID FspIopCompleteRequest(PIRP Irp, NTSTATUS Result) VOID FspIopCompleteIrp(PIRP Irp, NTSTATUS Result)
{ {
FspIopCompleteRequestEx(Irp, Result, TRUE); FspIopCompleteIrpEx(Irp, Result, TRUE);
} }
NTSTATUS FspIopDispatchPrepare(PIRP Irp, FSP_FSCTL_TRANSACT_REQ *Request); NTSTATUS FspIopDispatchPrepare(PIRP Irp, FSP_FSCTL_TRANSACT_REQ *Request);
VOID FspIopDispatchComplete(PIRP Irp, const FSP_FSCTL_TRANSACT_RSP *Response); VOID FspIopDispatchComplete(PIRP Irp, const FSP_FSCTL_TRANSACT_RSP *Response);

View File

@ -395,7 +395,7 @@ retry:
Result = FspIopDispatchPrepare(PendingIrp, PendingIrpRequest); Result = FspIopDispatchPrepare(PendingIrp, PendingIrpRequest);
if (!NT_SUCCESS(Result)) if (!NT_SUCCESS(Result))
FspIopCompleteRequest(PendingIrp, Result); FspIopCompleteIrp(PendingIrp, Result);
else else
{ {
NextRequest = FspFsctlTransactProduceRequest( NextRequest = FspFsctlTransactProduceRequest(
@ -415,7 +415,7 @@ retry:
* also cancel the PendingIrp we have in our hands. * also cancel the PendingIrp we have in our hands.
*/ */
ASSERT(FspIoqStopped(&FsvrtDeviceExtension->Ioq)); ASSERT(FspIoqStopped(&FsvrtDeviceExtension->Ioq));
FspIopCompleteRequest(PendingIrp, STATUS_CANCELLED); FspIopCompleteIrp(PendingIrp, STATUS_CANCELLED);
return STATUS_CANCELLED; return STATUS_CANCELLED;
} }

View File

@ -60,7 +60,7 @@ NTSTATUS FspIopCreateRequest(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
VOID FspIopCompleteRequestEx(PIRP Irp, NTSTATUS Result, BOOLEAN DeviceRelease) VOID FspIopCompleteIrpEx(PIRP Irp, NTSTATUS Result, BOOLEAN DeviceRelease)
{ {
// !PAGED_CODE(); // !PAGED_CODE();

View File

@ -100,7 +100,7 @@ static VOID FspIoqPendingReleaseLock(PIO_CSQ IoCsq, _IRQL_restores_ KIRQL Irql)
static VOID FspIoqPendingCompleteCanceledIrp(PIO_CSQ IoCsq, PIRP Irp) static VOID FspIoqPendingCompleteCanceledIrp(PIO_CSQ IoCsq, PIRP Irp)
{ {
FspIopCompleteRequest(Irp, STATUS_CANCELLED); FspIopCompleteIrp(Irp, STATUS_CANCELLED);
} }
static NTSTATUS FspIoqProcessInsertIrpEx(PIO_CSQ IoCsq, PIRP Irp, PVOID InsertContext) static NTSTATUS FspIoqProcessInsertIrpEx(PIO_CSQ IoCsq, PIRP Irp, PVOID InsertContext)
@ -151,7 +151,7 @@ static VOID FspIoqProcessReleaseLock(PIO_CSQ IoCsq, _IRQL_restores_ KIRQL Irql)
static VOID FspIoqProcessCompleteCanceledIrp(PIO_CSQ IoCsq, PIRP Irp) static VOID FspIoqProcessCompleteCanceledIrp(PIO_CSQ IoCsq, PIRP Irp)
{ {
FspIopCompleteRequest(Irp, STATUS_CANCELLED); FspIopCompleteIrp(Irp, STATUS_CANCELLED);
} }
VOID FspIoqInitialize(FSP_IOQ *Ioq) VOID FspIoqInitialize(FSP_IOQ *Ioq)