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 9c73d8c206ae1119e4885f51520f3c57a252b626..4e5a7ee35779a57404d74c9cd1f61148d43169d7 100644 (file)
--- 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 4115630abca09a0105e467049fb8a1fd12573d35..1e69d79e0ad0fcab23c74905988141c1d5847bb4 100644 (file)
--- 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 53b392ab0e69264e20ec9796437a89c1488f47d9..4c71831a6f8a7c9454db7d227793a8662181a8f6 100644 (file)
--- 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(