From dc09b10f1e43f90061193cb5d68b8a7ee2f15211 Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Sun, 19 Feb 2023 13:12:15 +0000 Subject: [PATCH] crimson/osd/object_conetxt*: Rename get_ro_ss to get_head_ss Signed-off-by: Matan Breizman (cherry picked from commit efcf292905135419f9f6f929f9bd3194e3661e61) --- src/crimson/osd/object_context.h | 2 +- src/crimson/osd/object_context_loader.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/crimson/osd/object_context.h b/src/crimson/osd/object_context.h index 10cfc667aba..8abf6d3f71e 100644 --- a/src/crimson/osd/object_context.h +++ b/src/crimson/osd/object_context.h @@ -84,7 +84,7 @@ public: return get_oid().get_head(); } - const SnapSet &get_ro_ss() const { + const SnapSet &get_head_ss() const { ceph_assert(is_head()); ceph_assert(ssc); return ssc->snapset; diff --git a/src/crimson/osd/object_context_loader.cc b/src/crimson/osd/object_context_loader.cc index 72612b9ccd9..0928fb78be0 100644 --- a/src/crimson/osd/object_context_loader.cc +++ b/src/crimson/osd/object_context_loader.cc @@ -60,7 +60,7 @@ using crimson::common::local_conf; with_obc_func_t&& func) { LOG_PREFIX(ObjectContextLoader::with_clone_obc_only); - auto coid = resolve_oid(head->get_ro_ss(), oid); + auto coid = resolve_oid(head->get_head_ss(), oid); if (!coid) { ERRORDPP("clone {} not found", dpp, oid); return load_obc_iertr::future<>{ -- 2.39.5