[FASTFAT]
[reactos.git] / reactos / drivers / filesystems / fastfat / rw.c
index 7474c5b..c3834b5 100644 (file)
@@ -150,12 +150,12 @@ VfatReadFileData(
     BytesPerSector = DeviceExt->FatInfo.BytesPerSector;
     BytesPerCluster = DeviceExt->FatInfo.BytesPerCluster;
 
-    ASSERT(ReadOffset.QuadPart + Length <= ROUND_UP(Fcb->RFCB.FileSize.QuadPart, BytesPerSector));
+    ASSERT(ReadOffset.QuadPart + Length <= ROUND_UP_64(Fcb->RFCB.FileSize.QuadPart, BytesPerSector));
     ASSERT(ReadOffset.u.LowPart % BytesPerSector == 0);
     ASSERT(Length % BytesPerSector == 0);
 
     /* Is this a read of the FAT? */
-    if (Fcb->Flags & FCB_IS_FAT)
+    if (BooleanFlagOn(Fcb->Flags, FCB_IS_FAT))
     {
         ReadOffset.QuadPart += DeviceExt->FatInfo.FATStart * BytesPerSector;
         Status = VfatReadDiskPartial(IrpContext, &ReadOffset, Length, 0, TRUE);
@@ -172,7 +172,7 @@ VfatReadFileData(
     }
 
     /* Is this a read of the Volume ? */
-    if (Fcb->Flags & FCB_IS_VOLUME)
+    if (BooleanFlagOn(Fcb->Flags, FCB_IS_VOLUME))
     {
         Status = VfatReadDiskPartial(IrpContext, &ReadOffset, Length, 0, TRUE);
         if (NT_SUCCESS(Status))
@@ -367,7 +367,7 @@ VfatWriteFileData(
     ASSERT(Length % BytesPerSector == 0);
 
     /* Is this a write of the volume? */
-    if (Fcb->Flags & FCB_IS_VOLUME)
+    if (BooleanFlagOn(Fcb->Flags, FCB_IS_VOLUME))
     {
         Status = VfatWriteDiskPartial(IrpContext, &WriteOffset, Length, 0, TRUE);
         if (!NT_SUCCESS(Status))
@@ -378,7 +378,7 @@ VfatWriteFileData(
     }
 
     /* Is this a write to the FAT? */
-    if (Fcb->Flags & FCB_IS_FAT)
+    if (BooleanFlagOn(Fcb->Flags, FCB_IS_FAT))
     {
         WriteOffset.u.LowPart += DeviceExt->FatInfo.FATStart * BytesPerSector;
         IrpContext->RefCount = 1;
@@ -547,6 +547,7 @@ VfatRead(
     LARGE_INTEGER ByteOffset;
     PVOID Buffer;
     ULONG BytesPerSector;
+    BOOLEAN PagingIo, CanWait, IsVolume, NoCache;
 
     ASSERT(IrpContext);
 
@@ -554,6 +555,10 @@ VfatRead(
 
     ASSERT(IrpContext->DeviceObject);
 
+    PagingIo = BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO);
+    CanWait = BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT);
+    NoCache = BooleanFlagOn(IrpContext->Irp->Flags, IRP_NOCACHE);
+
     // This request is not allowed on the main device object
     if (IrpContext->DeviceObject == VfatGlobalData->DeviceObject)
     {
@@ -567,14 +572,16 @@ VfatRead(
     Fcb = IrpContext->FileObject->FsContext;
     ASSERT(Fcb);
 
-    if (Fcb->Flags & FCB_IS_PAGE_FILE)
+    IsVolume = BooleanFlagOn(Fcb->Flags, FCB_IS_VOLUME);
+
+    if (BooleanFlagOn(Fcb->Flags, FCB_IS_PAGE_FILE))
     {
         PFATINFO FatInfo = &IrpContext->DeviceExt->FatInfo;
         IrpContext->Stack->Parameters.Read.ByteOffset.QuadPart += FatInfo->dataStart * FatInfo->BytesPerSector;
         IoSkipCurrentIrpStackLocation(IrpContext->Irp);
+        IrpContext->Flags &= ~IRPCONTEXT_COMPLETE;
         DPRINT("Read from page file, disk offset %I64x\n", IrpContext->Stack->Parameters.Read.ByteOffset.QuadPart);
         Status = IoCallDriver(IrpContext->DeviceExt->StorageDevice, IrpContext->Irp);
-        VfatFreeIrpContext(IrpContext);
         return Status;
     }
 
@@ -585,7 +592,7 @@ VfatRead(
     BytesPerSector = IrpContext->DeviceExt->FatInfo.BytesPerSector;
 
     /* fail if file is a directory and no paged read */
-    if (*Fcb->Attributes & FILE_ATTRIBUTE_DIRECTORY && !(IrpContext->Irp->Flags & IRP_PAGING_IO))
+    if (vfatFCBIsDirectory(Fcb) && !PagingIo)
     {
         Status = STATUS_INVALID_PARAMETER;
         goto ByeBye;
@@ -593,12 +600,19 @@ VfatRead(
 
     DPRINT("'%wZ', Offset: %u, Length %u\n", &Fcb->PathNameU, ByteOffset.u.LowPart, Length);
 
-    if (ByteOffset.u.HighPart && !(Fcb->Flags & FCB_IS_VOLUME))
+    if (ByteOffset.u.HighPart && !IsVolume)
     {
        Status = STATUS_INVALID_PARAMETER;
        goto ByeBye;
     }
 
+    if (Length == 0)
+    {
+        IrpContext->Irp->IoStatus.Information = 0;
+        Status = STATUS_SUCCESS;
+        goto ByeBye;
+    }
+
     if (ByteOffset.QuadPart >= Fcb->RFCB.FileSize.QuadPart)
     {
        IrpContext->Irp->IoStatus.Information = 0;
@@ -606,7 +620,7 @@ VfatRead(
        goto ByeBye;
     }
 
-    if (IrpContext->Irp->Flags & (IRP_PAGING_IO | IRP_NOCACHE) || (Fcb->Flags & FCB_IS_VOLUME))
+    if (NoCache || PagingIo || IsVolume)
     {
         if (ByteOffset.u.LowPart % BytesPerSector != 0 || Length % BytesPerSector != 0)
         {
@@ -617,18 +631,11 @@ VfatRead(
         }
     }
 
-    if (Length == 0)
-    {
-        IrpContext->Irp->IoStatus.Information = 0;
-        Status = STATUS_SUCCESS;
-        goto ByeBye;
-    }
-
-    if (Fcb->Flags & FCB_IS_VOLUME)
+    if (IsVolume)
     {
         Resource = &IrpContext->DeviceExt->DirResource;
     }
-    else if (IrpContext->Irp->Flags & IRP_PAGING_IO)
+    else if (PagingIo)
     {
         Resource = &Fcb->PagingIoResource;
     }
@@ -637,15 +644,14 @@ VfatRead(
         Resource = &Fcb->MainResource;
     }
 
-    if (!ExAcquireResourceSharedLite(Resource,
-                                     IrpContext->Flags & IRPCONTEXT_CANWAIT ? TRUE : FALSE))
+    if (!ExAcquireResourceSharedLite(Resource, CanWait))
     {
         Resource = NULL;
         Status = STATUS_PENDING;
         goto ByeBye;
     }
 
-    if (!(IrpContext->Irp->Flags & IRP_PAGING_IO) &&
+    if (!PagingIo &&
         FsRtlAreThereCurrentFileLocks(&Fcb->FileLock))
     {
         if (!FsRtlCheckLockForReadAccess(&Fcb->FileLock, IrpContext->Irp))
@@ -655,15 +661,9 @@ VfatRead(
         }
     }
 
-    Buffer = VfatGetUserBuffer(IrpContext->Irp);
-    if (!Buffer)
-    {
-        Status = STATUS_INVALID_USER_BUFFER;
-        goto ByeBye;
-    }
+    Buffer = VfatGetUserBuffer(IrpContext->Irp, PagingIo);
 
-    if (!(IrpContext->Irp->Flags & (IRP_NOCACHE|IRP_PAGING_IO)) &&
-        !(Fcb->Flags & (FCB_IS_PAGE_FILE|FCB_IS_VOLUME)))
+    if (!PagingIo && !NoCache && !IsVolume)
     {
         // cached read
         Status = STATUS_SUCCESS;
@@ -673,22 +673,35 @@ VfatRead(
             Status = /*STATUS_END_OF_FILE*/STATUS_SUCCESS;
         }
 
-        if (IrpContext->FileObject->PrivateCacheMap == NULL)
+        _SEH2_TRY
         {
-            CcInitializeCacheMap(IrpContext->FileObject,
-                                 (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize),
-                                 FALSE,
-                                 &(VfatGlobalData->CacheMgrCallbacks),
-                                 Fcb);
-        }
+            if (IrpContext->FileObject->PrivateCacheMap == NULL)
+            {
+                CcInitializeCacheMap(IrpContext->FileObject,
+                                     (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize),
+                                     FALSE,
+                                     &(VfatGlobalData->CacheMgrCallbacks),
+                                     Fcb);
+            }
 
-        if (!CcCopyRead(IrpContext->FileObject, &ByteOffset, Length,
-                        (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT), Buffer,
-                        &IrpContext->Irp->IoStatus))
+            if (!CcCopyRead(IrpContext->FileObject,
+                            &ByteOffset,
+                            Length,
+                            CanWait,
+                            Buffer,
+                            &IrpContext->Irp->IoStatus))
+            {
+                ASSERT(!CanWait);
+                Status = STATUS_PENDING;
+                goto ByeBye;
+            }
+        }
+        _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
         {
-            Status = STATUS_PENDING;
+            Status = _SEH2_GetExceptionCode();
             goto ByeBye;
         }
+        _SEH2_END;
 
         if (!NT_SUCCESS(IrpContext->Irp->IoStatus.Status))
         {
@@ -698,17 +711,17 @@ VfatRead(
     else
     {
         // non cached read
-        if (ByteOffset.QuadPart + Length > ROUND_UP(Fcb->RFCB.FileSize.QuadPart, BytesPerSector))
-        {
-            Length = (ULONG)(ROUND_UP(Fcb->RFCB.FileSize.QuadPart, BytesPerSector) - ByteOffset.QuadPart);
-        }
-
         Status = VfatLockUserBuffer(IrpContext->Irp, Length, IoWriteAccess);
         if (!NT_SUCCESS(Status))
         {
             goto ByeBye;
         }
 
+        if (ByteOffset.QuadPart + Length > ROUND_UP_64(Fcb->RFCB.FileSize.QuadPart, BytesPerSector))
+        {
+            Length = (ULONG)(ROUND_UP_64(Fcb->RFCB.FileSize.QuadPart, BytesPerSector) - ByteOffset.QuadPart);
+        }
+
         Status = VfatReadFileData(IrpContext, Length, ByteOffset, &ReturnedLength);
         if (NT_SUCCESS(Status))
         {
@@ -727,29 +740,22 @@ ByeBye:
         Status = VfatLockUserBuffer(IrpContext->Irp, Length, IoWriteAccess);
         if (NT_SUCCESS(Status))
         {
-            Status = VfatQueueRequest(IrpContext);
-        }
-        else
-        {
-            IrpContext->Irp->IoStatus.Status = Status;
-            IoCompleteRequest(IrpContext->Irp, IO_NO_INCREMENT);
-            VfatFreeIrpContext(IrpContext);
+            Status = VfatMarkIrpContextForQueue(IrpContext);
         }
     }
     else
     {
         IrpContext->Irp->IoStatus.Status = Status;
-        if (IrpContext->FileObject->Flags & FO_SYNCHRONOUS_IO &&
-            !(IrpContext->Irp->Flags & IRP_PAGING_IO) &&
+        if (BooleanFlagOn(IrpContext->FileObject->Flags, FO_SYNCHRONOUS_IO) &&
+            !PagingIo &&
             (NT_SUCCESS(Status) || Status == STATUS_END_OF_FILE))
         {
             IrpContext->FileObject->CurrentByteOffset.QuadPart =
                 ByteOffset.QuadPart + IrpContext->Irp->IoStatus.Information;
         }
 
-        IoCompleteRequest(IrpContext->Irp,
-                          (CCHAR)(NT_SUCCESS(Status) ? IO_DISK_INCREMENT : IO_NO_INCREMENT));
-        VfatFreeIrpContext(IrpContext);
+        if (NT_SUCCESS(Status))
+            IrpContext->PriorityBoost = IO_DISK_INCREMENT;
     }
     DPRINT("%x\n", Status);
     return Status;
@@ -767,6 +773,7 @@ VfatWrite(
     ULONG Length = 0;
     PVOID Buffer;
     ULONG BytesPerSector;
+    BOOLEAN PagingIo, CanWait, IsVolume, IsFAT, NoCache;
 
     ASSERT(IrpContext);
 
@@ -774,6 +781,10 @@ VfatWrite(
 
     ASSERT(IrpContext->DeviceObject);
 
+    PagingIo = BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO);
+    CanWait = BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT);
+    NoCache = BooleanFlagOn(IrpContext->Irp->Flags, IRP_NOCACHE);
+
     // This request is not allowed on the main device object
     if (IrpContext->DeviceObject == VfatGlobalData->DeviceObject)
     {
@@ -787,21 +798,24 @@ VfatWrite(
     Fcb = IrpContext->FileObject->FsContext;
     ASSERT(Fcb);
 
-    if (Fcb->Flags & FCB_IS_PAGE_FILE)
+    IsVolume = BooleanFlagOn(Fcb->Flags, FCB_IS_VOLUME);
+    IsFAT = BooleanFlagOn(Fcb->Flags, FCB_IS_FAT);
+
+    if (BooleanFlagOn(Fcb->Flags, FCB_IS_PAGE_FILE))
     {
         PFATINFO FatInfo = &IrpContext->DeviceExt->FatInfo;
         IrpContext->Stack->Parameters.Write.ByteOffset.QuadPart += FatInfo->dataStart * FatInfo->BytesPerSector;
         IoSkipCurrentIrpStackLocation(IrpContext->Irp);
+        IrpContext->Flags &= ~IRPCONTEXT_COMPLETE;
         DPRINT("Write to page file, disk offset %I64x\n", IrpContext->Stack->Parameters.Write.ByteOffset.QuadPart);
         Status = IoCallDriver(IrpContext->DeviceExt->StorageDevice, IrpContext->Irp);
-        VfatFreeIrpContext(IrpContext);
         return Status;
     }
 
     DPRINT("<%wZ>\n", &Fcb->PathNameU);
 
     /* fail if file is a directory and no paged read */
-    if (*Fcb->Attributes & FILE_ATTRIBUTE_DIRECTORY && !(IrpContext->Irp->Flags & IRP_PAGING_IO))
+    if (vfatFCBIsDirectory(Fcb) && !PagingIo)
     {
         Status = STATUS_INVALID_PARAMETER;
         goto ByeBye;
@@ -816,13 +830,13 @@ VfatWrite(
     Length = IrpContext->Stack->Parameters.Write.Length;
     BytesPerSector = IrpContext->DeviceExt->FatInfo.BytesPerSector;
 
-    if (ByteOffset.u.HighPart && !(Fcb->Flags & FCB_IS_VOLUME))
+    if (ByteOffset.u.HighPart && !IsVolume)
     {
         Status = STATUS_INVALID_PARAMETER;
         goto ByeBye;
     }
 
-    if (Fcb->Flags & (FCB_IS_FAT | FCB_IS_VOLUME) ||
+    if (IsFAT || IsVolume ||
         vfatDirEntryGetFirstCluster(IrpContext->DeviceExt, &Fcb->entry) == 1)
     {
         if (ByteOffset.QuadPart + Length > Fcb->RFCB.FileSize.QuadPart)
@@ -833,7 +847,7 @@ VfatWrite(
         }
     }
 
-    if (IrpContext->Irp->Flags & (IRP_PAGING_IO|IRP_NOCACHE) || (Fcb->Flags & FCB_IS_VOLUME))
+    if (PagingIo || NoCache || IsVolume)
     {
         if (ByteOffset.u.LowPart % BytesPerSector != 0 || Length % BytesPerSector != 0)
         {
@@ -843,15 +857,17 @@ VfatWrite(
         }
     }
 
+    OldFileSize = Fcb->RFCB.FileSize;
+
     if (Length == 0)
     {
-        /* FIXME: Update last write time */
+        /* Update last write time */
         IrpContext->Irp->IoStatus.Information = 0;
         Status = STATUS_SUCCESS;
-        goto ByeBye;
+        goto Metadata;
     }
 
-    if (IrpContext->Irp->Flags & IRP_PAGING_IO)
+    if (PagingIo)
     {
         if (ByteOffset.u.LowPart + Length > Fcb->RFCB.AllocationSize.u.LowPart)
         {
@@ -865,11 +881,11 @@ VfatWrite(
         }
     }
 
-    if (Fcb->Flags & FCB_IS_VOLUME)
+    if (IsVolume)
     {
         Resource = &IrpContext->DeviceExt->DirResource;
     }
-    else if (IrpContext->Irp->Flags & IRP_PAGING_IO)
+    else if (PagingIo)
     {
         Resource = &Fcb->PagingIoResource;
     }
@@ -878,10 +894,9 @@ VfatWrite(
         Resource = &Fcb->MainResource;
     }
 
-    if (Fcb->Flags & FCB_IS_PAGE_FILE)
+    if (PagingIo)
     {
-        if (!ExAcquireResourceSharedLite(Resource,
-                                         (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT)))
+        if (!ExAcquireResourceSharedLite(Resource, CanWait))
         {
             Resource = NULL;
             Status = STATUS_PENDING;
@@ -890,8 +905,7 @@ VfatWrite(
     }
     else
     {
-        if (!ExAcquireResourceExclusiveLite(Resource,
-                                            (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT)))
+        if (!ExAcquireResourceExclusiveLite(Resource, CanWait))
         {
             Resource = NULL;
             Status = STATUS_PENDING;
@@ -899,7 +913,7 @@ VfatWrite(
         }
     }
 
-    if (!(IrpContext->Irp->Flags & IRP_PAGING_IO) &&
+    if (!PagingIo &&
         FsRtlAreThereCurrentFileLocks(&Fcb->FileLock))
     {
         if (!FsRtlCheckLockForWriteAccess(&Fcb->FileLock, IrpContext->Irp))
@@ -909,7 +923,7 @@ VfatWrite(
         }
     }
 
-    if (!(IrpContext->Flags & IRPCONTEXT_CANWAIT) && !(Fcb->Flags & FCB_IS_VOLUME))
+    if (!CanWait && !IsVolume)
     {
         if (ByteOffset.u.LowPart + Length > Fcb->RFCB.AllocationSize.u.LowPart)
         {
@@ -918,18 +932,9 @@ VfatWrite(
         }
     }
 
-    OldFileSize = Fcb->RFCB.FileSize;
-
-    Buffer = VfatGetUserBuffer(IrpContext->Irp);
-    if (!Buffer)
-    {
-        Status = STATUS_INVALID_USER_BUFFER;
-        goto ByeBye;
-    }
-
+    Buffer = VfatGetUserBuffer(IrpContext->Irp, PagingIo);
 
-    if (!(Fcb->Flags & (FCB_IS_FAT|FCB_IS_VOLUME)) &&
-        !(IrpContext->Irp->Flags & IRP_PAGING_IO) &&
+    if (!IsFAT && !IsVolume && !PagingIo &&
         ByteOffset.u.LowPart + Length > Fcb->RFCB.FileSize.u.LowPart)
     {
         LARGE_INTEGER AllocationSize;
@@ -942,51 +947,62 @@ VfatWrite(
         }
     }
 
-    if (!(IrpContext->Irp->Flags & (IRP_NOCACHE|IRP_PAGING_IO)) &&
-        !(Fcb->Flags & (FCB_IS_PAGE_FILE|FCB_IS_VOLUME)))
+    if (!NoCache && !PagingIo && !IsVolume)
     {
         // cached write
 
-        if (IrpContext->FileObject->PrivateCacheMap == NULL)
+        _SEH2_TRY
         {
-            CcInitializeCacheMap(IrpContext->FileObject,
-                                 (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize),
-                                 FALSE,
-                                 &VfatGlobalData->CacheMgrCallbacks,
-                                 Fcb);
-        }
+            if (IrpContext->FileObject->PrivateCacheMap == NULL)
+            {
+                CcInitializeCacheMap(IrpContext->FileObject,
+                                     (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize),
+                                     FALSE,
+                                     &VfatGlobalData->CacheMgrCallbacks,
+                                     Fcb);
+            }
 
-        if (ByteOffset.QuadPart > OldFileSize.QuadPart)
-        {
-            CcZeroData(IrpContext->FileObject, &OldFileSize, &ByteOffset, TRUE);
-        }
+            if (ByteOffset.QuadPart > OldFileSize.QuadPart)
+            {
+                CcZeroData(IrpContext->FileObject, &OldFileSize, &ByteOffset, TRUE);
+            }
 
-        if (CcCopyWrite(IrpContext->FileObject, &ByteOffset, Length,
-                        1 /*IrpContext->Flags & IRPCONTEXT_CANWAIT*/, Buffer))
-        {
-            IrpContext->Irp->IoStatus.Information = Length;
-            Status = STATUS_SUCCESS;
+            if (CcCopyWrite(IrpContext->FileObject,
+                            &ByteOffset,
+                            Length,
+                            TRUE /*CanWait*/,
+                            Buffer))
+            {
+                IrpContext->Irp->IoStatus.Information = Length;
+                Status = STATUS_SUCCESS;
+            }
+            else
+            {
+                ASSERT(FALSE /*!CanWait*/);
+                Status = STATUS_UNSUCCESSFUL;
+            }
         }
-        else
+        _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
         {
-            Status = STATUS_UNSUCCESSFUL;
+            Status = _SEH2_GetExceptionCode();
         }
+        _SEH2_END;
     }
     else
     {
         // non cached write
-
-        if (ByteOffset.QuadPart > OldFileSize.QuadPart)
-        {
-            CcZeroData(IrpContext->FileObject, &OldFileSize, &ByteOffset, TRUE);
-        }
-
         Status = VfatLockUserBuffer(IrpContext->Irp, Length, IoReadAccess);
         if (!NT_SUCCESS(Status))
         {
+            Status = STATUS_INVALID_USER_BUFFER;
             goto ByeBye;
         }
 
+        if (ByteOffset.QuadPart > OldFileSize.QuadPart)
+        {
+            CcZeroData(IrpContext->FileObject, &OldFileSize, &ByteOffset, TRUE);
+        }
+
         Status = VfatWriteFileData(IrpContext, Length, ByteOffset);
         if (NT_SUCCESS(Status))
         {
@@ -994,17 +1010,17 @@ VfatWrite(
         }
     }
 
-    if (!(IrpContext->Irp->Flags & IRP_PAGING_IO) &&
-        !(Fcb->Flags & (FCB_IS_FAT|FCB_IS_VOLUME)))
+Metadata:
+    if (!PagingIo && !IsFAT && !IsVolume)
     {
-        if(!(*Fcb->Attributes & FILE_ATTRIBUTE_DIRECTORY))
+        if(!vfatFCBIsDirectory(Fcb))
         {
             LARGE_INTEGER SystemTime;
             ULONG Filter;
 
             // set dates and times
             KeQuerySystemTime (&SystemTime);
-            if (Fcb->Flags & FCB_IS_FATX_ENTRY)
+            if (vfatVolumeIsFatX(IrpContext->DeviceExt))
             {
                 FsdSystemTimeToDosDateTime(IrpContext->DeviceExt,
                                            &SystemTime, &Fcb->entry.FatX.UpdateDate,
@@ -1049,28 +1065,21 @@ ByeBye:
         Status = VfatLockUserBuffer(IrpContext->Irp, Length, IoReadAccess);
         if (NT_SUCCESS(Status))
         {
-            Status = VfatQueueRequest(IrpContext);
-        }
-        else
-        {
-            IrpContext->Irp->IoStatus.Status = Status;
-            IoCompleteRequest(IrpContext->Irp, IO_NO_INCREMENT);
-            VfatFreeIrpContext(IrpContext);
+            Status = VfatMarkIrpContextForQueue(IrpContext);
         }
     }
     else
     {
         IrpContext->Irp->IoStatus.Status = Status;
-        if (IrpContext->FileObject->Flags & FO_SYNCHRONOUS_IO &&
-            !(IrpContext->Irp->Flags & IRP_PAGING_IO) && NT_SUCCESS(Status))
+        if (BooleanFlagOn(IrpContext->FileObject->Flags, FO_SYNCHRONOUS_IO) &&
+            !PagingIo && NT_SUCCESS(Status))
         {
             IrpContext->FileObject->CurrentByteOffset.QuadPart =
                 ByteOffset.QuadPart + IrpContext->Irp->IoStatus.Information;
         }
 
-        IoCompleteRequest(IrpContext->Irp,
-                          (CCHAR)(NT_SUCCESS(Status) ? IO_DISK_INCREMENT : IO_NO_INCREMENT));
-        VfatFreeIrpContext(IrpContext);
+        if (NT_SUCCESS(Status))
+            IrpContext->PriorityBoost = IO_DISK_INCREMENT;
     }
     DPRINT("%x\n", Status);
     return Status;