From 6cc054e5904d35455e6e054e92aad7d1779a6db4 Mon Sep 17 00:00:00 2001
From: Pierre Schweitzer <pierre@reactos.org>
Date: Tue, 1 Jul 2008 19:05:42 +0000
Subject: [PATCH] Partly merged r34238

svn path=/trunk/; revision=34239
---
 reactos/drivers/filesystems/ntfs/fsctl.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/reactos/drivers/filesystems/ntfs/fsctl.c b/reactos/drivers/filesystems/ntfs/fsctl.c
index bbe39cc7aae..0095ec1612c 100644
--- a/reactos/drivers/filesystems/ntfs/fsctl.c
+++ b/reactos/drivers/filesystems/ntfs/fsctl.c
@@ -249,7 +249,7 @@ NtfsGetVolumeData(PDEVICE_OBJECT DeviceObject,
                            TRUE);
   if (!NT_SUCCESS(Status))
   {
-    ExFreePool (MftRecord);
+    ExFreePool(MftRecord);
     return Status;
   }
 
@@ -265,7 +265,7 @@ NtfsGetVolumeData(PDEVICE_OBJECT DeviceObject,
   Status = ReadFileRecord(DeviceExt, 3, VolumeRecord, MftRecord);
   if (!NT_SUCCESS(Status))
   {
-    ExFreePool (MftRecord);
+    ExFreePool(MftRecord);
     return Status;
   }
 
@@ -307,7 +307,8 @@ NtfsGetVolumeData(PDEVICE_OBJECT DeviceObject,
     NtfsInfo->Flags = VolumeInfo->Flags;
   }
 
-  ExFreePool (MftRecord);
+  ExFreePool(MftRecord);
+  ExFreePool(VolumeRecord);
 
   return Status;
 }
@@ -354,7 +355,7 @@ NtfsMountVolume(PDEVICE_OBJECT DeviceObject,
   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));