mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 21:07:35 +00:00
LibPartition: Migrate from DeprecatedFile to File
The implemented cloning mechanism should be sound: - If a PartitionTable is passed a File with ShouldCloseFileDescriptor::Yes, then it will keep it alive until the PartitionTable is destroyed. - If a PartitionTable is passed a File with ShouldCloseFileDescriptor::No, then the caller has to ensure that the file descriptor remains alive. If the caller is EBRPartitionTable, the same consideration holds. If the caller is PartitionEditor::PartitionModel, this is satisfied by keeping an OwnPtr<Core::File> around which is the originally opened file. Therefore, we never leak any fds, and never access a Core::File or fd after destroying it.
This commit is contained in:
parent
c197fb4037
commit
3d6b838df3
14 changed files with 221 additions and 177 deletions
|
@ -6,21 +6,11 @@
|
|||
|
||||
#include <LibPartition/EBRPartitionTable.h>
|
||||
|
||||
#ifndef KERNEL
|
||||
# include <LibCore/DeprecatedFile.h>
|
||||
#endif
|
||||
|
||||
namespace Partition {
|
||||
|
||||
#ifdef KERNEL
|
||||
ErrorOr<NonnullOwnPtr<EBRPartitionTable>> EBRPartitionTable::try_to_initialize(Kernel::StorageDevice& device)
|
||||
ErrorOr<NonnullOwnPtr<EBRPartitionTable>> EBRPartitionTable::try_to_initialize(PartitionableDevice device)
|
||||
{
|
||||
auto table = TRY(adopt_nonnull_own_or_enomem(new (nothrow) EBRPartitionTable(device)));
|
||||
#else
|
||||
ErrorOr<NonnullOwnPtr<EBRPartitionTable>> EBRPartitionTable::try_to_initialize(NonnullRefPtr<Core::DeprecatedFile> device_file)
|
||||
{
|
||||
auto table = TRY(adopt_nonnull_own_or_enomem(new (nothrow) EBRPartitionTable(move(device_file))));
|
||||
#endif
|
||||
auto table = TRY(adopt_nonnull_own_or_enomem(new (nothrow) EBRPartitionTable(move(device))));
|
||||
if (table->is_protective_mbr())
|
||||
return Error::from_errno(ENOTSUP);
|
||||
if (!table->is_valid())
|
||||
|
@ -28,16 +18,13 @@ ErrorOr<NonnullOwnPtr<EBRPartitionTable>> EBRPartitionTable::try_to_initialize(N
|
|||
return table;
|
||||
}
|
||||
|
||||
#ifdef KERNEL
|
||||
void EBRPartitionTable::search_extended_partition(Kernel::StorageDevice& device, MBRPartitionTable& checked_ebr, u64 current_block_offset, size_t limit)
|
||||
#else
|
||||
void EBRPartitionTable::search_extended_partition(NonnullRefPtr<Core::DeprecatedFile> device, MBRPartitionTable& checked_ebr, u64 current_block_offset, size_t limit)
|
||||
#endif
|
||||
void EBRPartitionTable::search_extended_partition(MBRPartitionTable& checked_ebr, u64 current_block_offset, size_t limit)
|
||||
{
|
||||
if (limit == 0)
|
||||
return;
|
||||
// EBRs should not carry more than 2 partitions (because they need to form a linked list)
|
||||
VERIFY(checked_ebr.partitions_count() <= 2);
|
||||
// FIXME: We should not crash the Kernel or any apps when the EBR is malformed.
|
||||
auto checked_logical_partition = checked_ebr.partition(0);
|
||||
|
||||
// If we are pointed to an invalid logical partition, something is seriously wrong.
|
||||
|
@ -46,18 +33,15 @@ void EBRPartitionTable::search_extended_partition(NonnullRefPtr<Core::Deprecated
|
|||
if (!checked_ebr.contains_ebr())
|
||||
return;
|
||||
current_block_offset += checked_ebr.partition(1).value().start_block();
|
||||
auto next_ebr = MBRPartitionTable::try_to_initialize(device, current_block_offset);
|
||||
auto next_ebr = MBRPartitionTable::try_to_initialize(m_device.clone_unowned(), current_block_offset);
|
||||
if (!next_ebr)
|
||||
return;
|
||||
search_extended_partition(device, *next_ebr, current_block_offset, (limit - 1));
|
||||
// FIXME: Should not rely on TCO here, since this might be called from inside the Kernel, where stack space isn't exactly free.
|
||||
search_extended_partition(*next_ebr, current_block_offset, (limit - 1));
|
||||
}
|
||||
|
||||
#ifdef KERNEL
|
||||
EBRPartitionTable::EBRPartitionTable(Kernel::StorageDevice& device)
|
||||
#else
|
||||
EBRPartitionTable::EBRPartitionTable(NonnullRefPtr<Core::DeprecatedFile> device)
|
||||
#endif
|
||||
: MBRPartitionTable(device)
|
||||
EBRPartitionTable::EBRPartitionTable(PartitionableDevice device)
|
||||
: MBRPartitionTable(move(device))
|
||||
{
|
||||
if (!is_header_valid())
|
||||
return;
|
||||
|
@ -70,11 +54,11 @@ EBRPartitionTable::EBRPartitionTable(NonnullRefPtr<Core::DeprecatedFile> device)
|
|||
auto& entry = header.entry[index];
|
||||
// Start enumerating all logical partitions
|
||||
if (entry.type == 0xf) {
|
||||
auto checked_ebr = MBRPartitionTable::try_to_initialize(device, entry.offset);
|
||||
auto checked_ebr = MBRPartitionTable::try_to_initialize(m_device.clone_unowned(), entry.offset);
|
||||
if (!checked_ebr)
|
||||
continue;
|
||||
// It's quite unlikely to see that amount of partitions, so stop at 128 partitions.
|
||||
search_extended_partition(device, *checked_ebr, entry.offset, 128);
|
||||
search_extended_partition(*checked_ebr, entry.offset, 128);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue