From 06532d8545b59503e799904ab371dc7c7cec5f89 Mon Sep 17 00:00:00 2001 From: Xuehan Xu Date: Wed, 23 Aug 2023 09:58:47 +0800 Subject: [PATCH] crimson/osd/object_context: rename ObjectContext::list_hook to obc_accessing_hook There's already a "list_hook" in the base class "intrusive_lru_base" Signed-off-by: Xuehan Xu --- src/crimson/osd/object_context.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/crimson/osd/object_context.h b/src/crimson/osd/object_context.h index 106968e60c3..75c99bb5468 100644 --- a/src/crimson/osd/object_context.h +++ b/src/crimson/osd/object_context.h @@ -130,7 +130,7 @@ private: }); } - boost::intrusive::list_member_hook<> list_hook; + boost::intrusive::list_member_hook<> obc_accessing_hook; uint64_t list_link_cnt = 0; bool fully_loaded = false; @@ -154,7 +154,7 @@ public: using obc_accessing_option_t = boost::intrusive::member_hook< ObjectContext, boost::intrusive::list_member_hook<>, - &ObjectContext::list_hook>; + &ObjectContext::obc_accessing_hook>; template auto with_lock(Func&& func) { -- 2.39.5