CleanupFileInformation (&PrivFsData->Root);\r
\r
Error_Find_Root_Dir:\r
- CleanupVolumeInformation (&PrivFsData->Volume);\r
\r
Error_Read_Udf_Volume:\r
Error_Invalid_Params:\r
}\r
ASSERT (NewFileEntryData != NULL);\r
\r
- if (IS_FE_SYMLINK (NewFileEntryData)) {\r
+ if (FE_ICB_FILE_TYPE (NewFileEntryData) == UdfFileEntrySymlink) {\r
Status = ResolveSymlink (\r
BlockIo,\r
DiskIo,\r
EFI_TPL OldTpl;\r
EFI_STATUS Status;\r
PRIVATE_UDF_FILE_DATA *PrivFileData;\r
- PRIVATE_UDF_SIMPLE_FS_DATA *PrivFsData;\r
\r
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
\r
\r
PrivFileData = PRIVATE_UDF_FILE_DATA_FROM_THIS (This);\r
\r
- PrivFsData = PRIVATE_UDF_SIMPLE_FS_DATA_FROM_THIS (PrivFileData->SimpleFs);\r
-\r
if (!PrivFileData->IsRootDirectory) {\r
CleanupFileInformation (&PrivFileData->File);\r
\r
}\r
}\r
\r
- if (--PrivFsData->OpenFiles == 0) {\r
- CleanupVolumeInformation (&PrivFsData->Volume);\r
- }\r
-\r
FreePool ((VOID *)PrivFileData);\r
\r
Exit:\r
// As per UEFI spec, if the file handle is a directory, then the current file\r
// position has no meaning and the operation is not supported.\r
//\r
- if (IS_FID_DIRECTORY_FILE (&PrivFileData->File.FileIdentifierDesc)) {\r
+ if (IS_FID_DIRECTORY_FILE (PrivFileData->File.FileIdentifierDesc)) {\r
return EFI_UNSUPPORTED;\r
}\r
\r
} else if (CompareGuid (InformationType, &gEfiFileSystemInfoGuid)) {\r
String = VolumeLabel;\r
\r
- FileSetDesc = PrivFsData->Volume.FileSetDescs[0];\r
+ FileSetDesc = &PrivFsData->Volume.FileSetDesc;\r
\r
OstaCompressed = &FileSetDesc->LogicalVolumeIdentifier[0];\r
\r
FileSystemInfo->Size = FileSystemInfoLength;\r
FileSystemInfo->ReadOnly = TRUE;\r
FileSystemInfo->BlockSize =\r
- LV_BLOCK_SIZE (&PrivFsData->Volume, UDF_DEFAULT_LV_NUM);\r
+ PrivFsData->Volume.LogicalVolDesc.LogicalBlockSize;\r
FileSystemInfo->VolumeSize = VolumeSize;\r
FileSystemInfo->FreeSpace = FreeSpaceSize;\r
\r