From 728c3fbd14252bd746f97dbb5441063992074b6b Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Sun, 21 Aug 2022 01:04:35 +0200
Subject: Kernel: Use RefPtr instead of LockRefPtr for Custody

By protecting all the RefPtr<Custody> objects that may be accessed from
multiple threads at the same time (with spinlocks), we remove the need
for using LockRefPtr<Custody> (which is basically a RefPtr with a
built-in spinlock.)
---
 Kernel/FileSystem/OpenFileDescription.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'Kernel/FileSystem/OpenFileDescription.h')

diff --git a/Kernel/FileSystem/OpenFileDescription.h b/Kernel/FileSystem/OpenFileDescription.h
index fc513f56cb..c4cdae2d49 100644
--- a/Kernel/FileSystem/OpenFileDescription.h
+++ b/Kernel/FileSystem/OpenFileDescription.h
@@ -8,6 +8,7 @@
 
 #include <AK/AtomicRefCounted.h>
 #include <AK/Badge.h>
+#include <AK/RefPtr.h>
 #include <Kernel/FileSystem/FIFO.h>
 #include <Kernel/FileSystem/Inode.h>
 #include <Kernel/FileSystem/InodeMetadata.h>
@@ -88,8 +89,8 @@ public:
     Inode* inode() { return m_inode.ptr(); }
     Inode const* inode() const { return m_inode.ptr(); }
 
-    Custody* custody() { return m_custody.ptr(); }
-    Custody const* custody() const { return m_custody.ptr(); }
+    RefPtr<Custody> custody();
+    RefPtr<Custody const> custody() const;
 
     ErrorOr<Memory::Region*> mmap(Process&, Memory::VirtualRange const&, u64 offset, int prot, bool shared);
 
@@ -138,12 +139,12 @@ private:
         blocker_set().unblock_all_blockers_whose_conditions_are_met();
     }
 
-    LockRefPtr<Custody> m_custody;
     LockRefPtr<Inode> m_inode;
     NonnullLockRefPtr<File> m_file;
 
     struct State {
         OwnPtr<OpenFileDescriptionData> data;
+        RefPtr<Custody> custody;
         off_t current_offset { 0 };
         u32 file_flags { 0 };
         bool readable : 1 { false };
-- 
cgit v1.2.3