From 628cfd18e3b658f24b7c689552f41fab2ae95f74 Mon Sep 17 00:00:00 2001
From: Matan Breizman <mbreizma@redhat.com>
Date: Sun, 5 Mar 2023 10:22:10 +0000
Subject: [PATCH] crimson/osd/object_context_loader: Hide private methods

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit b1632dbf17d0118b6a6c7aff1da15c62cbec6637)
---
 src/crimson/osd/object_context_loader.h | 34 +++++++++++++------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/crimson/osd/object_context_loader.h b/src/crimson/osd/object_context_loader.h
index ce5ad647538..82e2c1e4dd5 100644
--- a/src/crimson/osd/object_context_loader.h
+++ b/src/crimson/osd/object_context_loader.h
@@ -35,17 +35,15 @@ public:
   using with_both_obc_func_t =
     std::function<load_obc_iertr::future<> (ObjectContextRef, ObjectContextRef)>;
 
+  // Use this variant by default
   template<RWState::State State>
   load_obc_iertr::future<> with_obc(hobject_t oid,
                                     with_obc_func_t&& func);
 
-  template<RWState::State State>
-  load_obc_iertr::future<> with_clone_obc(hobject_t oid,
-                                          with_obc_func_t&& func);
-
   // Use this variant in the case where the head object
-  // obc is already locked. Avoid nesting
-  // with_head_obc() as in using with_clone_obc().
+  // obc is already locked and only the clone obc is needed.
+  // Avoid nesting with_head_obc() calls by using with_clone_obc()
+  // with an already locked head.
   template<RWState::State State>
   load_obc_iertr::future<> with_clone_obc_only(ObjectContextRef head,
                                                hobject_t oid,
@@ -59,6 +57,20 @@ public:
     hobject_t oid,
     with_both_obc_func_t&& func);
 
+  load_obc_iertr::future<> reload_obc(ObjectContext& obc) const;
+
+  void notify_on_change(bool is_primary);
+
+private:
+  ObjectContextRegistry& obc_registry;
+  PGBackend& backend;
+  DoutPrefixProvider& dpp;
+  obc_accessing_list_t obc_set_accessing;
+
+  template<RWState::State State>
+  load_obc_iertr::future<> with_clone_obc(hobject_t oid,
+                                          with_obc_func_t&& func);
+
   template<RWState::State State>
   load_obc_iertr::future<> with_head_obc(ObjectContextRef obc,
                                          bool existed,
@@ -71,15 +83,5 @@ public:
 
   load_obc_iertr::future<ObjectContextRef>
   load_obc(ObjectContextRef obc);
-
-  load_obc_iertr::future<> reload_obc(ObjectContext& obc) const;
-
-  void notify_on_change(bool is_primary);
-
-private:
-  ObjectContextRegistry& obc_registry;
-  PGBackend& backend;
-  DoutPrefixProvider& dpp;
-  obc_accessing_list_t obc_set_accessing;
 };
 }
-- 
2.39.5