Skip to content

Commit

Permalink
Kernel: Remove unused partition name API
Browse files Browse the repository at this point in the history
I was about to convert this to use KString, but then I realized it
wasn't actually used at all, so lets remove it until the day it is
needed.
  • Loading branch information
bgianfo authored and awesomekling committed Oct 3, 2021
1 parent 54a2aaa commit 40a58f1
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 13 deletions.
13 changes: 5 additions & 8 deletions Kernel/Storage/Partition/DiskPartitionMetadata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,12 @@ DiskPartitionMetadata::DiskPartitionMetadata(u64 start_block, u64 end_block, Arr
VERIFY(m_type.is_valid());
}

DiskPartitionMetadata::DiskPartitionMetadata(u64 start_block, u64 end_block, Array<u8, 16> partition_type, UUID unique_guid, u64 special_attributes, String name)
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)
, m_name(name)
{
VERIFY(m_type.is_valid());
VERIFY(!m_unique_guid.is_zero());
Expand All @@ -74,26 +73,24 @@ 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;
}
Optional<String> DiskPartitionMetadata::name() const
{
if (m_name.is_null() || m_name.is_empty())
return {};
return m_name;
}

const DiskPartitionMetadata::PartitionType& DiskPartitionMetadata::type() const
{
return m_type;
}

const UUID& DiskPartitionMetadata::unique_guid() const
{
return m_unique_guid;
Expand Down
4 changes: 1 addition & 3 deletions Kernel/Storage/Partition/DiskPartitionMetadata.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,13 @@ class DiskPartitionMetadata {
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, String name);
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;
Optional<String> name() const;
const PartitionType& type() const;
const UUID& unique_guid() const;

Expand All @@ -50,7 +49,6 @@ class DiskPartitionMetadata {
PartitionType m_type;
UUID m_unique_guid {};
u64 m_attributes { 0 };
String m_name;
};

}
3 changes: 1 addition & 2 deletions Kernel/Storage/Partition/GUIDPartitionTable.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,8 @@ bool GUIDPartitionTable::initialize()

Array<u8, 16> unique_guid {};
unique_guid.span().overwrite(0, entry.unique_guid, unique_guid.size());
String name = entry.partition_name;
dbgln("Detected GPT partition (entry={}), offset={}, limit={}", entry_index, entry.first_lba, entry.last_lba);
m_partitions.append({ entry.first_lba, entry.last_lba, partition_type, unique_guid, entry.attributes, "" });
m_partitions.append({ entry.first_lba, entry.last_lba, partition_type, unique_guid, entry.attributes });
raw_byte_index += header().partition_entry_size;
}

Expand Down

0 comments on commit 40a58f1

Please sign in to comment.