From 06af81fcfb0c00706f28fb46b8f318bd4441763b Mon Sep 17 00:00:00 2001 From: Idan Horowitz Date: Tue, 11 Jan 2022 22:34:26 +0200 Subject: [PATCH] Kernel: Move NonnullRefPtrVectors instead of copying them --- Kernel/Storage/NVMe/NVMeNameSpace.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Kernel/Storage/NVMe/NVMeNameSpace.cpp b/Kernel/Storage/NVMe/NVMeNameSpace.cpp index 77a8b70e5f..742bc6c8a0 100644 --- a/Kernel/Storage/NVMe/NVMeNameSpace.cpp +++ b/Kernel/Storage/NVMe/NVMeNameSpace.cpp @@ -7,7 +7,6 @@ #include "NVMeNameSpace.h" #include #include -#include #include namespace Kernel { @@ -17,15 +16,14 @@ ErrorOr> NVMeNameSpace::try_create(NonnullRefPtrVec auto minor_number = StorageManagement::generate_storage_minor_number(); auto major_number = StorageManagement::storage_type_major_number(); auto device_name_kstring = TRY(KString::formatted("nvme{:d}n{:d}", controller_id, nsid)); - auto device = TRY(DeviceManagement::try_create_device(queues, storage_size, lba_size, major_number.value(), minor_number.value(), nsid, move(device_name_kstring))); - + auto device = TRY(DeviceManagement::try_create_device(move(queues), storage_size, lba_size, major_number.value(), minor_number.value(), nsid, move(device_name_kstring))); return device; } NVMeNameSpace::NVMeNameSpace(NonnullRefPtrVector queues, size_t max_addresable_block, size_t lba_size, size_t major_number, size_t minor_number, u16 nsid, NonnullOwnPtr dev_name) : StorageDevice(major_number, minor_number, lba_size, max_addresable_block, move(dev_name)) , m_nsid(nsid) - , m_queues(queues) + , m_queues(move(queues)) { }