[pschweitzer] 34239: Partly merged r34238

Author: pschweitzer
Date: Tue Jul  1 14:05:42 2008
New Revision: 34239

URL: http://svn.reactos.org/svn/reactos?rev=34239&view=rev
Log:
Partly merged r34238

Modified:
    trunk/reactos/drivers/filesystems/ntfs/fsctl.c

Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/fs...
==============================================================================
--- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Tue Jul  1 14:05:42 2008
@@ -249,7 +249,7 @@
                            TRUE);
   if (!NT_SUCCESS(Status))
   {
-    ExFreePool (MftRecord);
+    ExFreePool(MftRecord);
     return Status;
   }

@@ -265,7 +265,7 @@
   Status = ReadFileRecord(DeviceExt, 3, VolumeRecord, MftRecord);
   if (!NT_SUCCESS(Status))
   {
-    ExFreePool (MftRecord);
+    ExFreePool(MftRecord);
     return Status;
   }

@@ -307,7 +307,8 @@
     NtfsInfo->Flags = VolumeInfo->Flags;
   }

-  ExFreePool (MftRecord);
+  ExFreePool(MftRecord);
+  ExFreePool(VolumeRecord);

return Status;
 }
@@ -354,7 +355,7 @@
   if (!NT_SUCCESS(Status))
     goto ByeBye;

-  NewDeviceObject->Flags = NewDeviceObject->Flags | DO_DIRECT_IO;
+  NewDeviceObject->Flags |= DO_DIRECT_IO;
   Vcb = (PVOID)NewDeviceObject->DeviceExtension;
   RtlZeroMemory(Vcb, sizeof(NTFS_VCB));