X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=FatPkg%2FEnhancedFatDxe%2FInfo.c;h=858b3f4a3e00a12b8a48ac7aff7f42f3e0ce4f88;hb=55248f85d180b0bbb0409638cc28e28a053123bd;hp=2ef4e9c809f9a0fc1088ce15c62966ebe82797c6;hpb=b9ec93308b33bcb0bb37d6213a76c3fed0b5bc0b;p=mirror_edk2.git

diff --git a/FatPkg/EnhancedFatDxe/Info.c b/FatPkg/EnhancedFatDxe/Info.c
index 2ef4e9c809..858b3f4a3e 100644
--- a/FatPkg/EnhancedFatDxe/Info.c
+++ b/FatPkg/EnhancedFatDxe/Info.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2005 - 2007, Intel Corporation
-All rights reserved. This program and the accompanying materials are licensed and made available
+Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials are licensed and made available
 under the terms and conditions of the BSD License which accompanies this
 distribution. The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
@@ -40,11 +40,11 @@ FatSetVolumeInfo (
 
 EFI_STATUS
 FatSetOrGetInfo (
-  IN BOOLEAN    IsSet,
-  IN EFI_FILE   *FHand,
-  IN EFI_GUID   *Type,
-  IN OUT UINTN  *BufferSize,
-  IN OUT VOID   *Buffer
+  IN BOOLEAN              IsSet,
+  IN EFI_FILE_PROTOCOL    *FHand,
+  IN EFI_GUID             *Type,
+  IN OUT UINTN            *BufferSize,
+  IN OUT VOID             *Buffer
   );
 
 EFI_STATUS
@@ -172,7 +172,7 @@ Returns:
   CHAR16                            Name[FAT_NAME_LEN + 1];
   EFI_STATUS                        Status;
 
-  Size        = SIZE_OF_EFI_FILE_SYSTEM_VOLUME_LABEL_INFO;
+  Size        = SIZE_OF_EFI_FILE_SYSTEM_VOLUME_LABEL;
   Status      = FatGetVolumeEntry (Volume, Name);
   NameSize    = StrSize (Name);
   ResultSize  = Size + NameSize;
@@ -252,11 +252,11 @@ Returns:
 
 --*/
 {
-  EFI_FILE_SYSTEM_VOLUME_LABEL_INFO *Info;
+  EFI_FILE_SYSTEM_VOLUME_LABEL *Info;
 
-  Info = (EFI_FILE_SYSTEM_VOLUME_LABEL_INFO *) Buffer;
+  Info = (EFI_FILE_SYSTEM_VOLUME_LABEL *) Buffer;
 
-  if (BufferSize < SIZE_OF_EFI_FILE_SYSTEM_VOLUME_LABEL_INFO + 2) {
+  if (BufferSize < SIZE_OF_EFI_FILE_SYSTEM_VOLUME_LABEL + 2) {
     return EFI_BAD_BUFFER_SIZE;
   }
 
@@ -474,11 +474,11 @@ Returns:
 
 EFI_STATUS
 FatSetOrGetInfo (
-  IN     BOOLEAN        IsSet,
-  IN     EFI_FILE       *FHand,
-  IN     EFI_GUID       *Type,
-  IN OUT UINTN          *BufferSize,
-  IN OUT VOID           *Buffer
+  IN     BOOLEAN            IsSet,
+  IN     EFI_FILE_PROTOCOL  *FHand,
+  IN     EFI_GUID           *Type,
+  IN OUT UINTN              *BufferSize,
+  IN OUT VOID               *Buffer
   )
 /*++
 
@@ -515,6 +515,8 @@ Returns:
     return EFI_DEVICE_ERROR;
   }
 
+  FatWaitNonblockingTask (IFile);
+
   FatAcquireLock ();
 
   //
@@ -526,20 +528,16 @@ Returns:
     //
     Status = EFI_UNSUPPORTED;
     if (IsSet) {
-      if (Volume->ReadOnly) {
-        Status = EFI_WRITE_PROTECTED;
-      } else {
-        if (CompareGuid (Type, &gEfiFileInfoGuid)) {
-          Status = FatSetFileInfo (Volume, IFile, OFile, *BufferSize, Buffer);
-        }
+      if (CompareGuid (Type, &gEfiFileInfoGuid)) {
+        Status = Volume->ReadOnly ? EFI_WRITE_PROTECTED : FatSetFileInfo (Volume, IFile, OFile, *BufferSize, Buffer);
+      }
 
-        if (CompareGuid (Type, &gEfiFileSystemInfoGuid)) {
-          Status = FatSetVolumeInfo (Volume, *BufferSize, Buffer);
-        }
+      if (CompareGuid (Type, &gEfiFileSystemInfoGuid)) {
+        Status = Volume->ReadOnly ? EFI_WRITE_PROTECTED : FatSetVolumeInfo (Volume, *BufferSize, Buffer);
+      }
 
-        if (CompareGuid (Type, &gEfiFileSystemVolumeLabelInfoIdGuid)) {
-          Status = FatSetVolumeLabelInfo (Volume, *BufferSize, Buffer);
-        }
+      if (CompareGuid (Type, &gEfiFileSystemVolumeLabelInfoIdGuid)) {
+        Status = Volume->ReadOnly ? EFI_WRITE_PROTECTED : FatSetVolumeLabelInfo (Volume, *BufferSize, Buffer);
       }
     } else {
       if (CompareGuid (Type, &gEfiFileInfoGuid)) {
@@ -556,7 +554,7 @@ Returns:
     }
   }
 
-  Status = FatCleanupVolume (Volume, NULL, Status);
+  Status = FatCleanupVolume (Volume, NULL, Status, NULL);
 
   FatReleaseLock ();
   return Status;
@@ -565,10 +563,10 @@ Returns:
 EFI_STATUS
 EFIAPI
 FatGetInfo (
-  IN     EFI_FILE       *FHand,
-  IN     EFI_GUID       *Type,
-  IN OUT UINTN          *BufferSize,
-     OUT VOID           *Buffer
+  IN     EFI_FILE_PROTOCOL   *FHand,
+  IN     EFI_GUID            *Type,
+  IN OUT UINTN               *BufferSize,
+     OUT VOID                *Buffer
   )
 /*++
 
@@ -596,10 +594,10 @@ Returns:
 EFI_STATUS
 EFIAPI
 FatSetInfo (
-  IN EFI_FILE  *FHand,
-  IN EFI_GUID  *Type,
-  IN UINTN     BufferSize,
-  IN VOID      *Buffer
+  IN EFI_FILE_PROTOCOL  *FHand,
+  IN EFI_GUID           *Type,
+  IN UINTN              BufferSize,
+  IN VOID               *Buffer
   )
 /*++