From 05249e4504f9cf30a1aa819bac2b713efe7a8bfd Mon Sep 17 00:00:00 2001
From: short <>
Date: Thu, 30 Jan 2003 10:46:15 +0000
Subject: [PATCH] Io{,Synchronous}Page{Read,Write}(): Remove handling of
 'Irp->UserIosb'  - it is now correctly handled by IoSecondStageCompletion()  
  and IofCompleteRequest()

---
 ntoskrnl/io/page.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/ntoskrnl/io/page.c b/ntoskrnl/io/page.c
index 5e43423..a485ce3 100644
--- a/ntoskrnl/io/page.c
+++ b/ntoskrnl/io/page.c
@@ -51,10 +51,6 @@ IoPageWrite(PFILE_OBJECT FileObject,
    StackPtr->FileObject = FileObject;
    DPRINT("Before IoCallDriver\n");
    Status = IofCallDriver(FileObject->DeviceObject,Irp);
-   /* FIXME: IoBuildSynchronousFsdRequestWithMdl() will fill 'StatusBlock' to 'Irp->UserIoSb'
-    * but W32 filesystem takes care just of 'Irp->IoStatus'. Hack it back here.
-    */
-   *StatusBlock=Irp->IoStatus;
    DPRINT("Status %d STATUS_PENDING %d\n",Status,STATUS_PENDING);
    return(Status);
 }
@@ -99,10 +95,6 @@ IoPageRead(PFILE_OBJECT FileObject,
    StackPtr->FileObject = FileObject;
    DPRINT("Before IoCallDriver\n");
    Status = IofCallDriver(FileObject->DeviceObject, Irp);
-   /* FIXME: IoBuildSynchronousFsdRequestWithMdl() will fill 'StatusBlock' to 'Irp->UserIoSb'
-    * but W32 filesystem takes care just of 'Irp->IoStatus'. Hack it back here.
-    */
-   *StatusBlock=Irp->IoStatus;
    DPRINT("Status %d STATUS_PENDING %d\n",Status,STATUS_PENDING);
 
    return(Status);
@@ -119,8 +111,8 @@ IoSynchronousPageWrite (PFILE_OBJECT FileObject,
    PIO_STACK_LOCATION StackPtr;
    NTSTATUS Status;
    
-   DPRINT("IoSynchronousPageWrite(FileObject %x, Mdl %x)\n",
-	  FileObject, Mdl);
+   DPRINT("IoSynchronousPageWrite(FileObject %x, Mdl %x, StatusBlock %x)\n",
+	  FileObject, Mdl, StatusBlock);
    
    Irp = IoBuildSynchronousFsdRequestWithMdl(IRP_MJ_WRITE,
 					     FileObject->DeviceObject,
@@ -138,10 +130,6 @@ IoSynchronousPageWrite (PFILE_OBJECT FileObject,
    StackPtr->FileObject = FileObject;
    DPRINT("Before IoCallDriver\n");
    Status = IofCallDriver(FileObject->DeviceObject,Irp);
-   /* FIXME: IoBuildSynchronousFsdRequestWithMdl() will fill 'StatusBlock' to 'Irp->UserIoSb'
-    * but W32 filesystem takes care just of 'Irp->IoStatus'. Hack it back here.
-    */
-   *StatusBlock=Irp->IoStatus;
    DPRINT("Status %d STATUS_PENDING %d\n",Status,STATUS_PENDING);
    return(Status);
 }
-- 
1.8.3.1