From f16fa41fb287f42e0dfae81f4ffe6292f7e3edbd Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Fri, 24 Jun 2011 01:36:32 +0000
Subject: [PATCH] [VFATLIB] - Don't overwrite format status with lock status

svn path=/trunk/; revision=52436
---
 reactos/lib/fslib/vfatlib/vfatlib.c | 54 ++++++++++++++---------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/reactos/lib/fslib/vfatlib/vfatlib.c b/reactos/lib/fslib/vfatlib/vfatlib.c
index c8c9c54f388..e46501c0fba 100644
--- a/reactos/lib/fslib/vfatlib/vfatlib.c
+++ b/reactos/lib/fslib/vfatlib/vfatlib.c
@@ -32,7 +32,7 @@ VfatFormat(IN PUNICODE_STRING DriveRoot,
     HANDLE FileHandle;
     PARTITION_INFORMATION PartitionInfo;
     FORMAT_CONTEXT Context;
-    NTSTATUS Status;
+    NTSTATUS Status, LockStatus;
 
     DPRINT("VfatFormat(DriveRoot '%wZ')\n", DriveRoot);
 
@@ -194,20 +194,20 @@ VfatFormat(IN PUNICODE_STRING DriveRoot,
         Context.Percent = 0;
         Callback (PROGRESS, 0, (PVOID)&Context.Percent);
     }
-    
-    Status = NtFsControlFile(FileHandle,
-                             NULL,
-                             NULL,
-                             NULL,
-                             &Iosb,
-                             FSCTL_LOCK_VOLUME,
-                             NULL,
-                             0,
-                             NULL,
-                             0);
-    if (!NT_SUCCESS(Status))
+
+    LockStatus = NtFsControlFile(FileHandle,
+                                 NULL,
+                                 NULL,
+                                 NULL,
+                                 &Iosb,
+                                 FSCTL_LOCK_VOLUME,
+                                 NULL,
+                                 0,
+                                 NULL,
+                                 0);
+    if (!NT_SUCCESS(LockStatus))
     {
-        DPRINT1("WARNING: Failed to lock volume for formatting! Format may fail! (Status: 0x%x)\n", Status);
+        DPRINT1("WARNING: Failed to lock volume for formatting! Format may fail! (Status: 0x%x)\n", LockStatus);
     }
 
     if (PartitionInfo.PartitionType == PARTITION_FAT_12)
@@ -250,20 +250,20 @@ VfatFormat(IN PUNICODE_STRING DriveRoot,
     {
         Status = STATUS_INVALID_PARAMETER;
     }
-    
-    Status = NtFsControlFile(FileHandle,
-                             NULL,
-                             NULL,
-                             NULL,
-                             &Iosb,
-                             FSCTL_UNLOCK_VOLUME,
-                             NULL,
-                             0,
-                             NULL,
-                             0);
-    if (!NT_SUCCESS(Status))
+
+    LockStatus = NtFsControlFile(FileHandle,
+                                 NULL,
+                                 NULL,
+                                 NULL,
+                                 &Iosb,
+                                 FSCTL_UNLOCK_VOLUME,
+                                 NULL,
+                                 0,
+                                 NULL,
+                                 0);
+    if (!NT_SUCCESS(LockStatus))
     {
-        DPRINT1("Failed to unlock volume (Status: 0x%x)\n", Status);
+        DPRINT1("Failed to unlock volume (Status: 0x%x)\n", LockStatus);
     }
 
     NtClose(FileHandle);