From f6ab636d3168a03b3b665da3492455a0d26cfa29 Mon Sep 17 00:00:00 2001
From: Samuel Bowman <sam@sambowman.tech>
Date: Tue, 1 Mar 2022 20:24:01 -0500
Subject: [PATCH] Kernel: Move DiskPartition up into Kernel/Storage

Everything in Kernel/Storage/Partition but DiskPartition has been moved
into LibPartiton. This makes the Partition directory unnecessary so
DiskPartition is moved up into Kernel/Storage.
---
 Kernel/CMakeLists.txt                            | 2 +-
 Kernel/Storage/{Partition => }/DiskPartition.cpp | 2 +-
 Kernel/Storage/{Partition => }/DiskPartition.h   | 0
 Kernel/Storage/StorageDevice.h                   | 2 +-
 Kernel/Storage/StorageManagement.h               | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename Kernel/Storage/{Partition => }/DiskPartition.cpp (98%)
 rename Kernel/Storage/{Partition => }/DiskPartition.h (100%)

diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index 4cdbdaf0ee..9f32bbc8d9 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -103,7 +103,6 @@ set(KERNEL_SOURCES
     Storage/ATA/ATADiskDevice.cpp
     Storage/ATA/ATAPIDiscDevice.cpp
     Storage/ATA/ATAPort.cpp
-    Storage/Partition/DiskPartition.cpp
     Storage/NVMe/NVMeController.cpp
     Storage/NVMe/NVMeNameSpace.cpp
     Storage/NVMe/NVMeInterruptQueue.cpp
@@ -111,6 +110,7 @@ set(KERNEL_SOURCES
     Storage/NVMe/NVMeQueue.cpp
     Storage/Ramdisk/Controller.cpp
     Storage/Ramdisk/Device.cpp
+    Storage/DiskPartition.cpp
     Storage/StorageController.cpp
     Storage/StorageDevice.cpp
     Storage/StorageManagement.cpp
diff --git a/Kernel/Storage/Partition/DiskPartition.cpp b/Kernel/Storage/DiskPartition.cpp
similarity index 98%
rename from Kernel/Storage/Partition/DiskPartition.cpp
rename to Kernel/Storage/DiskPartition.cpp
index 185f4f52f3..4e931af09f 100644
--- a/Kernel/Storage/Partition/DiskPartition.cpp
+++ b/Kernel/Storage/DiskPartition.cpp
@@ -7,7 +7,7 @@
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/FileSystem/OpenFileDescription.h>
-#include <Kernel/Storage/Partition/DiskPartition.h>
+#include <Kernel/Storage/DiskPartition.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/Partition/DiskPartition.h b/Kernel/Storage/DiskPartition.h
similarity index 100%
rename from Kernel/Storage/Partition/DiskPartition.h
rename to Kernel/Storage/DiskPartition.h
diff --git a/Kernel/Storage/StorageDevice.h b/Kernel/Storage/StorageDevice.h
index c0fb061c91..a8f0b583d0 100644
--- a/Kernel/Storage/StorageDevice.h
+++ b/Kernel/Storage/StorageDevice.h
@@ -10,7 +10,7 @@
 #include <Kernel/Devices/BlockDevice.h>
 #include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Locking/Mutex.h>
-#include <Kernel/Storage/Partition/DiskPartition.h>
+#include <Kernel/Storage/DiskPartition.h>
 #include <Kernel/Storage/StorageController.h>
 
 namespace Kernel {
diff --git a/Kernel/Storage/StorageManagement.h b/Kernel/Storage/StorageManagement.h
index 165704dc20..84fc698c7e 100644
--- a/Kernel/Storage/StorageManagement.h
+++ b/Kernel/Storage/StorageManagement.h
@@ -11,7 +11,7 @@
 #include <AK/NonnullRefPtrVector.h>
 #include <AK/Types.h>
 #include <Kernel/FileSystem/FileSystem.h>
-#include <Kernel/Storage/Partition/DiskPartition.h>
+#include <Kernel/Storage/DiskPartition.h>
 #include <Kernel/Storage/StorageController.h>
 #include <Kernel/Storage/StorageDevice.h>
 #include <LibPartition/PartitionTable.h>