[VFATLIB]

- Don't overwrite format status with lock status

svn path=/trunk/; revision=52436
This commit is contained in:
Cameron Gutman 2011-06-24 01:36:32 +00:00
parent a3b61053bc
commit f16fa41fb2

View file

@ -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);
@ -195,7 +195,7 @@ VfatFormat(IN PUNICODE_STRING DriveRoot,
Callback (PROGRESS, 0, (PVOID)&Context.Percent);
}
Status = NtFsControlFile(FileHandle,
LockStatus = NtFsControlFile(FileHandle,
NULL,
NULL,
NULL,
@ -205,9 +205,9 @@ VfatFormat(IN PUNICODE_STRING DriveRoot,
0,
NULL,
0);
if (!NT_SUCCESS(Status))
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)
@ -251,7 +251,7 @@ VfatFormat(IN PUNICODE_STRING DriveRoot,
Status = STATUS_INVALID_PARAMETER;
}
Status = NtFsControlFile(FileHandle,
LockStatus = NtFsControlFile(FileHandle,
NULL,
NULL,
NULL,
@ -261,9 +261,9 @@ VfatFormat(IN PUNICODE_STRING DriveRoot,
0,
NULL,
0);
if (!NT_SUCCESS(Status))
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);