From 462618b68c0b11d169262c30e4cdad9e4065f059 Mon Sep 17 00:00:00 2001
From: Liav A <liavalb@gmail.com>
Date: Sat, 19 Mar 2022 11:55:55 +0200
Subject: [PATCH] Kernel/Storage: Move Ramdisk code into a separate
 subdirectory

---
 Kernel/CMakeLists.txt                                         | 4 ++--
 .../Storage/{RamdiskController.cpp => Ramdisk/Controller.cpp} | 2 +-
 Kernel/Storage/{RamdiskController.h => Ramdisk/Controller.h}  | 2 +-
 Kernel/Storage/{RamdiskDevice.cpp => Ramdisk/Device.cpp}      | 4 ++--
 Kernel/Storage/{RamdiskDevice.h => Ramdisk/Device.h}          | 0
 Kernel/Storage/StorageManagement.cpp                          | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename Kernel/Storage/{RamdiskController.cpp => Ramdisk/Controller.cpp} (97%)
 rename Kernel/Storage/{RamdiskController.h => Ramdisk/Controller.h} (95%)
 rename Kernel/Storage/{RamdiskDevice.cpp => Ramdisk/Device.cpp} (96%)
 rename Kernel/Storage/{RamdiskDevice.h => Ramdisk/Device.h} (100%)

diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index 8686e6719c..9299819f79 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -112,9 +112,9 @@ set(KERNEL_SOURCES
     Storage/NVMe/NVMeInterruptQueue.cpp
     Storage/NVMe/NVMePollQueue.cpp
     Storage/NVMe/NVMeQueue.cpp
+    Storage/Ramdisk/Controller.cpp
+    Storage/Ramdisk/Device.cpp
     Storage/StorageDevice.cpp
-    Storage/RamdiskController.cpp
-    Storage/RamdiskDevice.cpp
     Storage/StorageManagement.cpp
     DoubleBuffer.cpp
     FileSystem/AnonymousFile.cpp
diff --git a/Kernel/Storage/RamdiskController.cpp b/Kernel/Storage/Ramdisk/Controller.cpp
similarity index 97%
rename from Kernel/Storage/RamdiskController.cpp
rename to Kernel/Storage/Ramdisk/Controller.cpp
index d70eadabb2..81f5a079b9 100644
--- a/Kernel/Storage/RamdiskController.cpp
+++ b/Kernel/Storage/Ramdisk/Controller.cpp
@@ -7,7 +7,7 @@
 #include <AK/OwnPtr.h>
 #include <AK/RefPtr.h>
 #include <AK/Types.h>
-#include <Kernel/Storage/RamdiskController.h>
+#include <Kernel/Storage/Ramdisk/Controller.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/RamdiskController.h b/Kernel/Storage/Ramdisk/Controller.h
similarity index 95%
rename from Kernel/Storage/RamdiskController.h
rename to Kernel/Storage/Ramdisk/Controller.h
index 28a09816f7..9a88070769 100644
--- a/Kernel/Storage/RamdiskController.h
+++ b/Kernel/Storage/Ramdisk/Controller.h
@@ -9,7 +9,7 @@
 #include <AK/OwnPtr.h>
 #include <AK/RefPtr.h>
 #include <AK/Types.h>
-#include <Kernel/Storage/RamdiskDevice.h>
+#include <Kernel/Storage/Ramdisk/Device.h>
 #include <Kernel/Storage/StorageController.h>
 #include <Kernel/Storage/StorageDevice.h>
 
diff --git a/Kernel/Storage/RamdiskDevice.cpp b/Kernel/Storage/Ramdisk/Device.cpp
similarity index 96%
rename from Kernel/Storage/RamdiskDevice.cpp
rename to Kernel/Storage/Ramdisk/Device.cpp
index d726d1879f..4beb3a3083 100644
--- a/Kernel/Storage/RamdiskDevice.cpp
+++ b/Kernel/Storage/Ramdisk/Device.cpp
@@ -8,8 +8,8 @@
 #include <AK/StringView.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/FileSystem/OpenFileDescription.h>
-#include <Kernel/Storage/RamdiskController.h>
-#include <Kernel/Storage/RamdiskDevice.h>
+#include <Kernel/Storage/Ramdisk/Controller.h>
+#include <Kernel/Storage/Ramdisk/Device.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/RamdiskDevice.h b/Kernel/Storage/Ramdisk/Device.h
similarity index 100%
rename from Kernel/Storage/RamdiskDevice.h
rename to Kernel/Storage/Ramdisk/Device.h
diff --git a/Kernel/Storage/StorageManagement.cpp b/Kernel/Storage/StorageManagement.cpp
index f737140fa5..42bb90713a 100644
--- a/Kernel/Storage/StorageManagement.cpp
+++ b/Kernel/Storage/StorageManagement.cpp
@@ -23,7 +23,7 @@
 #include <Kernel/Storage/Partition/EBRPartitionTable.h>
 #include <Kernel/Storage/Partition/GUIDPartitionTable.h>
 #include <Kernel/Storage/Partition/MBRPartitionTable.h>
-#include <Kernel/Storage/RamdiskController.h>
+#include <Kernel/Storage/Ramdisk/Controller.h>
 #include <Kernel/Storage/StorageManagement.h>
 
 namespace Kernel {