[FASTFAT] Fix size checking in VfatGetFileNameInformation()

[reactos.git] / drivers / filesystems / ntfs / close.c

diff --git a/drivers/filesystems/ntfs/close.c b/drivers/filesystems/ntfs/close.c
index 1ce7659..008f453 100644 (file)
--- a/drivers/filesystems/ntfs/close.c
+++ b/drivers/filesystems/ntfs/close.c
@@ -36,18 +36,19 @@
 /*
  * FUNCTION: Closes a file
  */
-static
 NTSTATUS
 NtfsCloseFile(PDEVICE_EXTENSION DeviceExt,
               PFILE_OBJECT FileObject)
 {
     PNTFS_CCB Ccb;
+    PNTFS_FCB Fcb;
 
     DPRINT("NtfsCloseFile(DeviceExt %p, FileObject %p)\n",
            DeviceExt,
            FileObject);
 
     Ccb = (PNTFS_CCB)(FileObject->FsContext2);
+    Fcb = (PNTFS_FCB)(FileObject->FsContext);
 
     DPRINT("Ccb %p\n", Ccb);
     if (Ccb == NULL)
@@ -56,13 +57,16 @@ NtfsCloseFile(PDEVICE_EXTENSION DeviceExt,
     }
 
     FileObject->FsContext2 = NULL;
+    FileObject->FsContext = NULL;
+    FileObject->SectionObjectPointer = NULL;
+    DeviceExt->OpenHandleCount--;
 
     if (FileObject->FileName.Buffer)
     {
         // This a FO, that was created outside from FSD.
         // Some FO's are created with IoCreateStreamFileObject() insid from FSD.
         // This FO's don't have a FileName.
-        NtfsReleaseFCB(DeviceExt, FileObject->FsContext);
+        NtfsReleaseFCB(DeviceExt, Fcb);
     }
 
     if (Ccb->DirectorySearchPattern)
@@ -76,35 +80,43 @@ NtfsCloseFile(PDEVICE_EXTENSION DeviceExt,
 }
 
 
-NTSTATUS NTAPI
-NtfsFsdClose(PDEVICE_OBJECT DeviceObject,
-             PIRP Irp)
+NTSTATUS
+NtfsClose(PNTFS_IRP_CONTEXT IrpContext)
 {
     PDEVICE_EXTENSION DeviceExtension;
-    PIO_STACK_LOCATION Stack;
     PFILE_OBJECT FileObject;
     NTSTATUS Status;
+    PDEVICE_OBJECT DeviceObject;
 
     DPRINT("NtfsClose() called\n");
 
+    DeviceObject = IrpContext->DeviceObject;
     if (DeviceObject == NtfsGlobalData->DeviceObject)
     {
         DPRINT("Closing file system\n");
-        Status = STATUS_SUCCESS;
-        goto ByeBye;
+        IrpContext->Irp->IoStatus.Information = 0;
+        return STATUS_SUCCESS;
     }
 
-    Stack = IoGetCurrentIrpStackLocation(Irp);
-    FileObject = Stack->FileObject;
+    FileObject = IrpContext->FileObject;
     DeviceExtension = DeviceObject->DeviceExtension;
 
-    Status = NtfsCloseFile(DeviceExtension,FileObject);
+    if (!ExAcquireResourceExclusiveLite(&DeviceExtension->DirResource,
+                                        BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT)))
+    {
+        return NtfsMarkIrpContextForQueue(IrpContext);
+    }
+
+    Status = NtfsCloseFile(DeviceExtension, FileObject);
+
+    ExReleaseResourceLite(&DeviceExtension->DirResource);
 
-ByeBye:
-    Irp->IoStatus.Status = Status;
-    Irp->IoStatus.Information = 0;
+    if (Status == STATUS_PENDING)
+    {
+        return NtfsMarkIrpContextForQueue(IrpContext);
+    }
 
-    IoCompleteRequest(Irp, IO_NO_INCREMENT);
+    IrpContext->Irp->IoStatus.Information = 0;
     return Status;
 }