update for HEAD-2003050101

[reactos.git] / drivers / fs / vfat / misc.c

diff --git a/drivers/fs/vfat/misc.c b/drivers/fs/vfat/misc.c
index b2bd621..ec26c9d 100644 (file)
--- a/drivers/fs/vfat/misc.c
+++ b/drivers/fs/vfat/misc.c
@@ -71,15 +71,13 @@ NTSTATUS VfatLockControl(
    )
 {
    PVFATFCB Fcb;
-   PVFATCCB Ccb;
    NTSTATUS Status;
 
    DPRINT("VfatLockControl(IrpContext %x)\n", IrpContext);
  
    assert(IrpContext);
 
-   Ccb = (PVFATCCB)IrpContext->FileObject->FsContext2;
-   Fcb = Ccb->pFcb;
+   Fcb = (PVFATFCB)IrpContext->FileObject->FsContext;
 
    if (IrpContext->DeviceObject == VfatGlobalData->DeviceObject)
    {
@@ -119,8 +117,6 @@ NTSTATUS STDCALL VfatBuildRequest (
 
    assert (DeviceObject);
    assert (Irp);
-
-   FsRtlEnterFileSystem();
    IrpContext = VfatAllocateIrpContext(DeviceObject, Irp);
    if (IrpContext == NULL)
    {
@@ -130,9 +126,20 @@ NTSTATUS STDCALL VfatBuildRequest (
    }
    else
    {
+      if (KeGetCurrentIrql() <= PASSIVE_LEVEL)
+      {
+         FsRtlEnterFileSystem();
+      }
+      else
+      {
+         DPRINT1("Vfat is entered at irql = %d\n", KeGetCurrentIrql());
+      }
       Status = VfatDispatchRequest (IrpContext);
+      if (KeGetCurrentIrql() <= PASSIVE_LEVEL)
+      {
+         FsRtlExitFileSystem();
+      }
    }
-   FsRtlExitFileSystem();
    return Status;
 }