diff --git a/kernel/include/kernel/Epoll.h b/kernel/include/kernel/Epoll.h index e7e3d0ad..6a9e9ea8 100644 --- a/kernel/include/kernel/Epoll.h +++ b/kernel/include/kernel/Epoll.h @@ -49,14 +49,6 @@ namespace Kernel BAN::ErrorOr fsync_impl() override { return {}; } private: - struct InodeRefPtrHash - { - BAN::hash_t operator()(const BAN::RefPtr& inode) - { - return BAN::hash()(inode.ptr()); - } - }; - struct ListenEventList { ListenEventList() = default; @@ -100,9 +92,9 @@ namespace Kernel private: ThreadBlocker m_thread_blocker; SpinLock m_ready_lock; - BAN::HashMap, uint32_t, InodeRefPtrHash> m_ready_events; - BAN::HashMap, uint32_t, InodeRefPtrHash> m_processing_events; - BAN::HashMap, ListenEventList, InodeRefPtrHash> m_listening_events; + BAN::HashMap, uint32_t> m_ready_events; + BAN::HashMap, uint32_t> m_processing_events; + BAN::HashMap, ListenEventList> m_listening_events; }; } diff --git a/kernel/kernel/Networking/UNIX/Socket.cpp b/kernel/kernel/Networking/UNIX/Socket.cpp index 40dea7f3..3a624b1d 100644 --- a/kernel/kernel/Networking/UNIX/Socket.cpp +++ b/kernel/kernel/Networking/UNIX/Socket.cpp @@ -14,15 +14,7 @@ namespace Kernel { - struct UnixSocketHash - { - BAN::hash_t operator()(const BAN::RefPtr& socket) - { - return BAN::hash{}(socket.ptr()); - } - }; - - static BAN::HashMap, BAN::WeakPtr, UnixSocketHash> s_bound_sockets; + static BAN::HashMap, BAN::WeakPtr> s_bound_sockets; static Mutex s_bound_socket_lock; static constexpr size_t s_packet_buffer_size = 0x10000;