From becfd2e1c50e56f09c91b87613cfcb383af011df Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Tue, 8 Nov 2016 16:37:49 -0800
Subject: [PATCH] sys: request work item refactoring

---
 src/sys/driver.h | 12 ++++++------
 src/sys/iop.c    | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/sys/driver.h b/src/sys/driver.h
index 3a651357..3608e22b 100644
--- a/src/sys/driver.h
+++ b/src/sys/driver.h
@@ -679,9 +679,9 @@ VOID FspMetaCacheInvalidateItem(FSP_META_CACHE *MetaCache, UINT64 ItemIndex);
 #define FSP_FSCTL_TRANSACT_REQ_ALIGNMENT 16
 enum
 {
-    FspIopCreateRequestMustSucceed      = 0x01,
-    FspIopCreateRequestNonPaged         = 0x02,
-    FspIopCreateRequestWorkItem         = 0x04,
+    FspIopCreateRequestMustSucceedFlag  = 0x01,
+    FspIopCreateRequestNonPagedFlag     = 0x02,
+    FspIopCreateRequestWorkItemFlag     = 0x04,
 };
 typedef VOID FSP_IOP_REQUEST_FINI(FSP_FSCTL_TRANSACT_REQ *Request, PVOID Context[4]);
 typedef NTSTATUS FSP_IOP_REQUEST_WORK(
@@ -742,13 +742,13 @@ VOID FspIrpDeleteRequest(PIRP Irp)
 #define FspIopCreateRequest(I, F, E, P) \
     FspIopCreateRequestFunnel(I, F, E, 0, 0, P)
 #define FspIopCreateRequestMustSucceed(I, F, E, P)\
-    FspIopCreateRequestFunnel(I, F, E, 0, FspIopCreateRequestMustSucceed, P)
+    FspIopCreateRequestFunnel(I, F, E, 0, FspIopCreateRequestMustSucceedFlag, P)
 #define FspIopCreateRequestEx(I, F, E, RF, P)\
     FspIopCreateRequestFunnel(I, F, E, RF, 0, P)
 #define FspIopCreateRequestMustSucceedEx(I, F, E, RF, P)\
-    FspIopCreateRequestFunnel(I, F, E, RF, FspIopCreateRequestMustSucceed, P)
+    FspIopCreateRequestFunnel(I, F, E, RF, FspIopCreateRequestMustSucceedFlag, P)
 #define FspIopCreateRequestAndWorkItem(I, E, RF, P)\
-    FspIopCreateRequestFunnel(I, 0, E, RF, FspIopCreateRequestWorkItem, P)
+    FspIopCreateRequestFunnel(I, 0, E, RF, FspIopCreateRequestWorkItemFlag, P)
 #define FspIopRequestContext(Request, I)\
     (*FspIopRequestContextAddress(Request, I))
 #define FspIopPostWorkRequest(D, R)     FspIopPostWorkRequestFunnel(D, R, FALSE)
diff --git a/src/sys/iop.c b/src/sys/iop.c
index b1b38cae..4c7950b4 100644
--- a/src/sys/iop.c
+++ b/src/sys/iop.c
@@ -74,14 +74,14 @@ NTSTATUS FspIopCreateRequestFunnel(
     if (FSP_FSCTL_TRANSACT_REQ_SIZEMAX < sizeof *Request + ExtraSize)
         return STATUS_INVALID_PARAMETER;
 
-    if (FlagOn(Flags, FspIopCreateRequestMustSucceed))
+    if (FlagOn(Flags, FspIopCreateRequestMustSucceedFlag))
     {
         RequestHeader = FspAllocatePoolMustSucceed(
-            FlagOn(Flags, FspIopCreateRequestNonPaged) ? NonPagedPool : PagedPool,
+            FlagOn(Flags, FspIopCreateRequestNonPagedFlag) ? NonPagedPool : PagedPool,
             sizeof *RequestHeader + sizeof *Request + ExtraSize + REQ_HEADER_ALIGN_OVERHEAD,
             FSP_ALLOC_INTERNAL_TAG);
 
-        if (FlagOn(Flags, FspIopCreateRequestWorkItem))
+        if (FlagOn(Flags, FspIopCreateRequestWorkItemFlag))
         {
             RequestWorkItem = FspAllocatePoolMustSucceed(
                 NonPagedPool, sizeof *RequestWorkItem, FSP_ALLOC_INTERNAL_TAG);
@@ -92,13 +92,13 @@ NTSTATUS FspIopCreateRequestFunnel(
     else
     {
         RequestHeader = ExAllocatePoolWithTag(
-            FlagOn(Flags, FspIopCreateRequestNonPaged) ? NonPagedPool : PagedPool,
+            FlagOn(Flags, FspIopCreateRequestNonPagedFlag) ? NonPagedPool : PagedPool,
             sizeof *RequestHeader + sizeof *Request + ExtraSize + REQ_HEADER_ALIGN_OVERHEAD,
             FSP_ALLOC_INTERNAL_TAG);
         if (0 == RequestHeader)
             return STATUS_INSUFFICIENT_RESOURCES;
 
-        if (FlagOn(Flags, FspIopCreateRequestWorkItem))
+        if (FlagOn(Flags, FspIopCreateRequestWorkItemFlag))
         {
             RequestWorkItem = ExAllocatePoolWithTag(
                 NonPagedPool, sizeof *RequestWorkItem, FSP_ALLOC_INTERNAL_TAG);