From 7054f1403df9542f0fff891655920d7f1002ddc4 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 27 Aug 2020 22:22:04 +0800 Subject: [PATCH] crimson/osd: improve the const correctness it should suffice to pass a `const OSD&` to the ctor of `OsdStatusHook` Signed-off-by: Kefu Chai --- src/crimson/admin/osd_admin.cc | 6 +++--- src/crimson/osd/osd.cc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/crimson/admin/osd_admin.cc b/src/crimson/admin/osd_admin.cc index 5f7c987fd25bb..4848897f290e2 100644 --- a/src/crimson/admin/osd_admin.cc +++ b/src/crimson/admin/osd_admin.cc @@ -34,7 +34,7 @@ std::unique_ptr make_asok_hook(Args&&... args) */ class OsdStatusHook : public AdminSocketHook { public: - explicit OsdStatusHook(crimson::osd::OSD& osd) : + explicit OsdStatusHook(const crimson::osd::OSD& osd) : AdminSocketHook{"status", "", "OSD status"}, osd(osd) {} @@ -49,10 +49,10 @@ public: return seastar::make_ready_future(f.get()); } private: - crimson::osd::OSD& osd; + const crimson::osd::OSD& osd; }; template std::unique_ptr -make_asok_hook(crimson::osd::OSD& osd); +make_asok_hook(const crimson::osd::OSD& osd); /** * An OSD admin hook: send beacon diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc index 68e7d56f46e92..84bdf114b3e22 100644 --- a/src/crimson/osd/osd.cc +++ b/src/crimson/osd/osd.cc @@ -427,7 +427,7 @@ seastar::future<> OSD::start_asok_admin() return asok->start(asok_path).then([this] { return seastar::when_all_succeed( asok->register_admin_commands(), - asok->register_command(make_asok_hook(*this)), + asok->register_command(make_asok_hook(std::as_const(*this))), asok->register_command(make_asok_hook(*this)), asok->register_command(make_asok_hook(*this)), asok->register_command(make_asok_hook(std::as_const(*this)))); -- 2.39.5