tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OvmfPkg/VirtioFsDxe: erase the dir. entry in EFI_FILE_PROTOCOL.Delete() 

At this point, the infrastructure is available for looking up the directly
containing directory of the file in EFI_FILE_PROTOCOL.Delete(), and to
remove the file in that directory by last pathname component. Do so.

The "RM" UEFI shell command will start working only later in the series;
the shell needs more EFI_FILE_PROTOCOL members to function before it calls
Delete().

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3097
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20201216211125.19496-28-lersek@redhat.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@arm.com>
This commit is contained in:
Laszlo Ersek 2020-12-16 22:11:04 +01:00 committed by mergify[bot]
parent de0e11902b
commit c09441c321
1 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
OvmfPkg/VirtioFsDxe/SimpleFsDelete.c
View File

@ -46,9 +46,47 @@ VirtioFsSimpleFileDelete (
// is still valid. Continue with removing the file or directory. The result
// of this operation determines the return status of the function.
//
// TODO
//
Status = EFI_WARN_DELETE_FAILURE;
if (VirtioFsFile->IsOpenForWriting) {
UINT64 ParentNodeId;
CHAR8 *LastComponent;
//
// Split our canonical pathname into most specific parent directory
// (identified by NodeId), and single-component filename within that
// directory. If This stands for the root directory "/", then the following
// function call will gracefully fail.
//
Status = VirtioFsLookupMostSpecificParentDir (
VirtioFs,
VirtioFsFile->CanonicalPathname,
&ParentNodeId,
&LastComponent
);
if (!EFI_ERROR (Status)) {
//
// Attempt the actual removal. Regardless of the outcome, ParentNodeId
// must be forgotten right after (unless it stands for the root
// directory).
//
Status = VirtioFsFuseRemoveFileOrDir (
VirtioFs,
ParentNodeId,
LastComponent,
VirtioFsFile->IsDirectory
);
if (ParentNodeId != VIRTIO_FS_FUSE_ROOT_DIR_NODE_ID) {
VirtioFsFuseForget (VirtioFs, ParentNodeId);
}
}
if (EFI_ERROR (Status)) {
//
// Map any failure to the spec-mandated warning code.
//
Status = EFI_WARN_DELETE_FAILURE;
}
} else {
Status = EFI_WARN_DELETE_FAILURE;
}
//
// Finally, if we've known VirtioFsFile->NodeId from a lookup, then we should