[win-pv-devel] [PATCH 2/4] Pass SrbExt to RingPrepare* calls

[<owen.smith@xxxxxxxxxx>]

From: Owen Smith <owen.smith@xxxxxxxxxx>

Signed-off-by: Owen Smith <owen.smith@xxxxxxxxxx>
---
 src/xenvbd/ring.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/xenvbd/ring.c b/src/xenvbd/ring.c
index 5af1a69..e569dbd 100644
--- a/src/xenvbd/ring.c
+++ b/src/xenvbd/ring.c
@@ -793,10 +793,10 @@ RingCancelRequestList(
 static BOOLEAN
 RingPrepareReadWrite(
     IN  PXENVBD_RING        Ring,
-    IN  PSCSI_REQUEST_BLOCK Srb
+    IN  PXENVBD_SRBEXT      SrbExt
     )
 {
-    PXENVBD_SRBEXT          SrbExt = Srb->SrbExtension;
+    PSCSI_REQUEST_BLOCK     Srb = SrbExt->Srb;
     ULONG64                 SectorStart = Cdb_LogicalBlock(Srb);
     ULONG                   SectorsLeft = Cdb_TransferBlock(Srb);
     LIST_ENTRY              List;
@@ -853,10 +853,10 @@ fail1:
 static BOOLEAN
 RingPrepareSyncCache(
     IN  PXENVBD_RING        Ring,
-    IN  PSCSI_REQUEST_BLOCK Srb
+    IN  PXENVBD_SRBEXT      SrbExt
     )
 {
-    PXENVBD_SRBEXT          SrbExt = Srb->SrbExtension;
+    PSCSI_REQUEST_BLOCK     Srb = SrbExt->Srb;
     PXENVBD_REQUEST         Request;
     LIST_ENTRY              List;
     UCHAR                   Operation;
@@ -894,10 +894,10 @@ fail1:
 static BOOLEAN
 RingPrepareUnmap(
     IN  PXENVBD_RING        Ring,
-    IN  PSCSI_REQUEST_BLOCK Srb
+    IN  PXENVBD_SRBEXT      SrbExt
     )
 {
-    PXENVBD_SRBEXT          SrbExt = Srb->SrbExtension;
+    PSCSI_REQUEST_BLOCK     Srb = SrbExt->Srb;
     PUNMAP_LIST_HEADER      Unmap = Srb->DataBuffer;
        ULONG                   Count = 
_byteswap_ushort(*(PUSHORT)Unmap->BlockDescrDataLength) / 
sizeof(UNMAP_BLOCK_DESCRIPTOR);
     ULONG                   Index;
@@ -952,15 +952,15 @@ RingPrepareFresh(
     switch (Cdb_OperationEx(SrbExt->Srb)) {
     case SCSIOP_READ:
     case SCSIOP_WRITE:
-        if (RingPrepareReadWrite(Ring, SrbExt->Srb))
+        if (RingPrepareReadWrite(Ring, SrbExt))
             return TRUE;    // prepared this SRB
         break;
     case SCSIOP_SYNCHRONIZE_CACHE:
-        if (RingPrepareSyncCache(Ring, SrbExt->Srb))
+        if (RingPrepareSyncCache(Ring, SrbExt))
             return TRUE;    // prepared this SRB
         break;
     case SCSIOP_UNMAP:
-        if (RingPrepareUnmap(Ring, SrbExt->Srb))
+        if (RingPrepareUnmap(Ring, SrbExt))
             return TRUE;    // prepared this SRB
         break;
     default:
-- 
2.8.3


_______________________________________________
win-pv-devel mailing list
win-pv-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/win-pv-devel