From: Kefu Chai <kchai@redhat.com>
Date: Thu, 27 Aug 2020 14:22:04 +0000 (+0800)
Subject: crimson/osd: improve the const correctness
X-Git-Tag: v16.1.0~1268^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7054f1403df9542f0fff891655920d7f1002ddc4;p=ceph.git

crimson/osd: improve the const correctness

it should suffice to pass a `const OSD&` to the ctor of `OsdStatusHook`

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/admin/osd_admin.cc b/src/crimson/admin/osd_admin.cc
index 5f7c987fd25..4848897f290 100644
--- a/src/crimson/admin/osd_admin.cc
+++ b/src/crimson/admin/osd_admin.cc
@@ -34,7 +34,7 @@ std::unique_ptr<AdminSocketHook> 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<tell_result_t>(f.get());
   }
 private:
-  crimson::osd::OSD& osd;
+  const crimson::osd::OSD& osd;
 };
 template std::unique_ptr<AdminSocketHook>
-make_asok_hook<OsdStatusHook>(crimson::osd::OSD& osd);
+make_asok_hook<OsdStatusHook>(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 68e7d56f46e..84bdf114b3e 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<OsdStatusHook>(*this)),
+      asok->register_command(make_asok_hook<OsdStatusHook>(std::as_const(*this))),
       asok->register_command(make_asok_hook<SendBeaconHook>(*this)),
       asok->register_command(make_asok_hook<FlushPgStatsHook>(*this)),
       asok->register_command(make_asok_hook<DumpPGStateHistory>(std::as_const(*this))));