1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 03:47:35 +00:00

Kernel+LibPartition: Move DiskPartitionMetadata into LibPartition

This commit creates a new library LibPartition which will contain
partition related code sharable between Kernel and Userland and
includes DiskPartitionMetadata as the first shared class.
This commit is contained in:
Samuel Bowman 2022-02-12 14:21:28 -05:00 committed by Linus Groh
parent 2786147774
commit be1c5c6b9f
9 changed files with 27 additions and 20 deletions

View file

@ -11,7 +11,7 @@
namespace Kernel {
NonnullRefPtr<DiskPartition> DiskPartition::create(BlockDevice& device, unsigned minor_number, DiskPartitionMetadata metadata)
NonnullRefPtr<DiskPartition> DiskPartition::create(BlockDevice& device, unsigned minor_number, Partition::DiskPartitionMetadata metadata)
{
auto partition_or_error = DeviceManagement::try_create_device<DiskPartition>(device, minor_number, metadata);
// FIXME: Find a way to propagate errors
@ -19,7 +19,7 @@ NonnullRefPtr<DiskPartition> DiskPartition::create(BlockDevice& device, unsigned
return partition_or_error.release_value();
}
DiskPartition::DiskPartition(BlockDevice& device, unsigned minor_number, DiskPartitionMetadata metadata)
DiskPartition::DiskPartition(BlockDevice& device, unsigned minor_number, Partition::DiskPartitionMetadata metadata)
: BlockDevice(100, minor_number, device.block_size())
, m_device(device)
, m_metadata(metadata)
@ -28,7 +28,7 @@ DiskPartition::DiskPartition(BlockDevice& device, unsigned minor_number, DiskPar
DiskPartition::~DiskPartition() = default;
DiskPartitionMetadata const& DiskPartition::metadata() const
Partition::DiskPartitionMetadata const& DiskPartition::metadata() const
{
return m_metadata;
}

View file

@ -9,7 +9,7 @@
#include <AK/RefPtr.h>
#include <AK/WeakPtr.h>
#include <Kernel/Devices/BlockDevice.h>
#include <Kernel/Storage/Partition/DiskPartitionMetadata.h>
#include <LibPartition/DiskPartitionMetadata.h>
namespace Kernel {
@ -17,7 +17,7 @@ class DiskPartition final : public BlockDevice {
friend class DeviceManagement;
public:
static NonnullRefPtr<DiskPartition> create(BlockDevice&, unsigned, DiskPartitionMetadata);
static NonnullRefPtr<DiskPartition> create(BlockDevice&, unsigned, Partition::DiskPartitionMetadata);
virtual ~DiskPartition();
virtual void start_request(AsyncBlockDeviceRequest&) override;
@ -28,14 +28,14 @@ public:
virtual ErrorOr<size_t> write(OpenFileDescription&, u64, UserOrKernelBuffer const&, size_t) override;
virtual bool can_write(OpenFileDescription const&, u64) const override;
DiskPartitionMetadata const& metadata() const;
Partition::DiskPartitionMetadata const& metadata() const;
private:
DiskPartition(BlockDevice&, unsigned, DiskPartitionMetadata);
DiskPartition(BlockDevice&, unsigned, Partition::DiskPartitionMetadata);
virtual StringView class_name() const override;
WeakPtr<BlockDevice> m_device;
DiskPartitionMetadata m_metadata;
Partition::DiskPartitionMetadata m_metadata;
};
}

View file

@ -1,99 +0,0 @@
/*
* Copyright (c) 2020, Liav A. <liavalb@hotmail.co.il>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <AK/AllOf.h>
#include <Kernel/Storage/Partition/DiskPartitionMetadata.h>
namespace Kernel {
DiskPartitionMetadata::PartitionType::PartitionType(u8 partition_type)
{
m_partition_type[0] = partition_type;
}
DiskPartitionMetadata::PartitionType::PartitionType(Array<u8, 16> partition_type)
: m_partition_type_is_uuid(true)
{
m_partition_type.span().overwrite(0, partition_type.data(), partition_type.size());
}
UUID DiskPartitionMetadata::PartitionType::to_uuid() const
{
VERIFY(is_uuid());
return m_partition_type;
}
u8 DiskPartitionMetadata::PartitionType::to_byte_indicator() const
{
VERIFY(!is_uuid());
return m_partition_type[0];
}
bool DiskPartitionMetadata::PartitionType::is_uuid() const
{
return m_partition_type_is_uuid;
}
bool DiskPartitionMetadata::PartitionType::is_valid() const
{
return !all_of(m_partition_type, [](auto const octet) { return octet == 0; });
}
DiskPartitionMetadata::DiskPartitionMetadata(u64 start_block, u64 end_block, u8 partition_type)
: m_start_block(start_block)
, m_end_block(end_block)
, m_type(partition_type)
{
VERIFY(m_type.is_valid());
}
DiskPartitionMetadata::DiskPartitionMetadata(u64 start_block, u64 end_block, Array<u8, 16> partition_type)
: m_start_block(start_block)
, m_end_block(end_block)
, m_type(partition_type)
{
VERIFY(m_type.is_valid());
}
DiskPartitionMetadata::DiskPartitionMetadata(u64 start_block, u64 end_block, Array<u8, 16> partition_type, UUID unique_guid, u64 special_attributes)
: m_start_block(start_block)
, m_end_block(end_block)
, m_type(partition_type)
, m_unique_guid(unique_guid)
, m_attributes(special_attributes)
{
VERIFY(m_type.is_valid());
VERIFY(!m_unique_guid.is_zero());
}
DiskPartitionMetadata DiskPartitionMetadata::offset(u64 blocks_count) const
{
return { blocks_count + m_start_block, blocks_count + m_end_block, m_type.m_partition_type };
}
u64 DiskPartitionMetadata::start_block() const
{
return m_start_block;
}
u64 DiskPartitionMetadata::end_block() const
{
return m_end_block;
}
Optional<u64> DiskPartitionMetadata::special_attributes() const
{
if (m_attributes == 0)
return {};
return m_attributes;
}
DiskPartitionMetadata::PartitionType const& DiskPartitionMetadata::type() const
{
return m_type;
}
const UUID& DiskPartitionMetadata::unique_guid() const
{
return m_unique_guid;
}
}

View file

@ -1,54 +0,0 @@
/*
* Copyright (c) 2020, Liav A. <liavalb@hotmail.co.il>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <AK/RefPtr.h>
#include <AK/UUID.h>
#include <Kernel/Devices/BlockDevice.h>
namespace Kernel {
class DiskPartitionMetadata {
private:
class PartitionType {
friend class DiskPartitionMetadata;
public:
explicit PartitionType(u8 partition_type);
explicit PartitionType(Array<u8, 16> partition_type);
UUID to_uuid() const;
u8 to_byte_indicator() const;
bool is_uuid() const;
bool is_valid() const;
private:
Array<u8, 16> m_partition_type {};
bool m_partition_type_is_uuid { false };
};
public:
DiskPartitionMetadata(u64 block_offset, u64 block_limit, u8 partition_type);
DiskPartitionMetadata(u64 start_block, u64 end_block, Array<u8, 16> partition_type);
DiskPartitionMetadata(u64 block_offset, u64 block_limit, Array<u8, 16> partition_type, UUID unique_guid, u64 special_attributes);
u64 start_block() const;
u64 end_block() const;
DiskPartitionMetadata offset(u64 blocks_count) const;
Optional<u64> special_attributes() const;
PartitionType const& type() const;
const UUID& unique_guid() const;
private:
u64 m_start_block;
u64 m_end_block;
PartitionType m_type;
UUID m_unique_guid {};
u64 m_attributes { 0 };
};
}

View file

@ -12,7 +12,7 @@ PartitionTable::PartitionTable(StorageDevice const& device)
{
}
Optional<DiskPartitionMetadata> PartitionTable::partition(unsigned index)
Optional<Partition::DiskPartitionMetadata> PartitionTable::partition(unsigned index)
{
if (index > partitions_count())
return {};

View file

@ -9,25 +9,25 @@
#include <AK/RefPtr.h>
#include <AK/Vector.h>
#include <Kernel/Storage/Partition/DiskPartition.h>
#include <Kernel/Storage/Partition/DiskPartitionMetadata.h>
#include <Kernel/Storage/StorageDevice.h>
#include <LibPartition/DiskPartitionMetadata.h>
namespace Kernel {
class PartitionTable {
public:
Optional<DiskPartitionMetadata> partition(unsigned index);
Optional<Partition::DiskPartitionMetadata> partition(unsigned index);
size_t partitions_count() const { return m_partitions.size(); }
virtual ~PartitionTable() = default;
virtual bool is_valid() const = 0;
Vector<DiskPartitionMetadata> partitions() const { return m_partitions; }
Vector<Partition::DiskPartitionMetadata> partitions() const { return m_partitions; }
protected:
explicit PartitionTable(StorageDevice const&);
NonnullRefPtr<StorageDevice> m_device;
Vector<DiskPartitionMetadata> m_partitions;
Vector<Partition::DiskPartitionMetadata> m_partitions;
};
}