From: Samuel Just <sjust@redhat.com>
Date: Wed, 25 Jan 2023 06:55:19 +0000 (+0000)
Subject: crimson/osd/object_context_loader: take backend by reference
X-Git-Tag: v18.1.0~419^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=edf4f3eec97c0e87cafdd10be3e074fcb759a701;p=ceph.git

crimson/osd/object_context_loader: take backend by reference

It's required and we don't check for null.

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/crimson/osd/object_context_loader.cc b/src/crimson/osd/object_context_loader.cc
index 9c73d8c206ae..4e5a7ee35779 100644
--- a/src/crimson/osd/object_context_loader.cc
+++ b/src/crimson/osd/object_context_loader.cc
@@ -101,7 +101,7 @@ using crimson::common::local_conf;
   ObjectContextLoader::load_obc_iertr::future<ObjectContextRef>
   ObjectContextLoader::load_obc(ObjectContextRef obc)
   {
-    return backend->load_metadata(obc->get_oid())
+    return backend.load_metadata(obc->get_oid())
     .safe_then_interruptible(
       [obc=std::move(obc)](auto md)
       -> load_obc_ertr::future<ObjectContextRef> {
@@ -152,7 +152,7 @@ using crimson::common::local_conf;
   ObjectContextLoader::reload_obc(ObjectContext& obc) const
   {
     assert(obc.is_head());
-    return backend->load_metadata(obc.get_oid())
+    return backend.load_metadata(obc.get_oid())
     .safe_then_interruptible<false>(
       [&obc](auto md)-> load_obc_ertr::future<> {
       logger().debug(
diff --git a/src/crimson/osd/object_context_loader.h b/src/crimson/osd/object_context_loader.h
index 4115630abca0..1e69d79e0ad0 100644
--- a/src/crimson/osd/object_context_loader.h
+++ b/src/crimson/osd/object_context_loader.h
@@ -15,7 +15,7 @@ public:
 
   ObjectContextLoader(
     ShardServices& _shard_services,
-    PGBackend* _backend)
+    PGBackend& _backend)
     : shard_services{_shard_services},
       backend{_backend}
     {}
@@ -66,7 +66,7 @@ public:
 
 private:
   ShardServices &shard_services;
-  PGBackend* backend;
+  PGBackend& backend;
   obc_accessing_list_t obc_set_accessing;
 };
 }
diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index 53b392ab0e69..4c71831a6f8a 100644
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -136,7 +136,7 @@ PG::PG(
       this),
     obc_loader{
       shard_services,
-      backend.get()},
+      *backend.get()},
     wait_for_active_blocker(this)
 {
   peering_state.set_backend_predicates(