From 03cb3e5370a8a3f63ee25ddb0c9878e7ce88500b Mon Sep 17 00:00:00 2001
From: Idan Horowitz <idan.horowitz@gmail.com>
Date: Fri, 9 Feb 2024 17:26:56 +0200
Subject: [PATCH] Kernel: Move NVMeQueue's m_cq_lock to NVMePollQueue

It's only used by that subclass, so there's no reason for it to be
defined as part of the parent class.
---
 Kernel/Devices/Storage/NVMe/NVMePollQueue.h | 3 +++
 Kernel/Devices/Storage/NVMe/NVMeQueue.h     | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Kernel/Devices/Storage/NVMe/NVMePollQueue.h b/Kernel/Devices/Storage/NVMe/NVMePollQueue.h
index e2b3182224..c98dd54d00 100644
--- a/Kernel/Devices/Storage/NVMe/NVMePollQueue.h
+++ b/Kernel/Devices/Storage/NVMe/NVMePollQueue.h
@@ -18,5 +18,8 @@ public:
 
 protected:
     NVMePollQueue(NonnullOwnPtr<Memory::Region> rw_dma_region, NonnullRefPtr<Memory::PhysicalPage> rw_dma_page, u16 qid, u32 q_depth, OwnPtr<Memory::Region> cq_dma_region, OwnPtr<Memory::Region> sq_dma_region, Doorbell db_regs);
+
+private:
+    Spinlock<LockRank::Interrupts> m_cq_lock {};
 };
 }
diff --git a/Kernel/Devices/Storage/NVMe/NVMeQueue.h b/Kernel/Devices/Storage/NVMe/NVMeQueue.h
index 3bc15db597..b088e0180a 100644
--- a/Kernel/Devices/Storage/NVMe/NVMeQueue.h
+++ b/Kernel/Devices/Storage/NVMe/NVMeQueue.h
@@ -112,7 +112,6 @@ private:
     }
 
 protected:
-    Spinlock<LockRank::Interrupts> m_cq_lock {};
     SpinlockProtected<HashMap<u16, NVMeIO>, LockRank::None> m_requests;
     NonnullOwnPtr<Memory::Region> m_rw_dma_region;