From edf4f3eec97c0e87cafdd10be3e074fcb759a701 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Wed, 25 Jan 2023 06:55:19 +0000 Subject: [PATCH] crimson/osd/object_context_loader: take backend by reference It's required and we don't check for null. Signed-off-by: Samuel Just --- src/crimson/osd/object_context_loader.cc | 4 ++-- src/crimson/osd/object_context_loader.h | 4 ++-- src/crimson/osd/pg.cc | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/crimson/osd/object_context_loader.cc b/src/crimson/osd/object_context_loader.cc index 9c73d8c206ae1..4e5a7ee35779a 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 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 { @@ -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( [&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 4115630abca09..1e69d79e0ad0f 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 53b392ab0e692..4c71831a6f8a7 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( -- 2.39.5