From: Matan Breizman <mbreizma@redhat.com>
Date: Wed, 7 Jun 2023 14:36:37 +0000 (+0000)
Subject: crimson/osd/osd: handle_osd_map() remove unused ConnectionRef conn
X-Git-Tag: v19.0.0~986^2~7
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3bae740a2e3a5561cbc75c75ab1e52c450045731;p=ceph-ci.git

crimson/osd/osd: handle_osd_map() remove unused ConnectionRef conn

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
---

diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc
index 2ec8fc48f6f..dfb4f1e3e3d 100644
--- a/src/crimson/osd/osd.cc
+++ b/src/crimson/osd/osd.cc
@@ -707,7 +707,7 @@ OSD::ms_dispatch(crimson::net::ConnectionRef conn, MessageRef m)
                                                 m=std::move(m), &dispatched] {
     switch (m->get_type()) {
     case CEPH_MSG_OSD_MAP:
-      return handle_osd_map(conn, boost::static_pointer_cast<MOSDMap>(m));
+      return handle_osd_map(boost::static_pointer_cast<MOSDMap>(m));
     case CEPH_MSG_OSD_OP:
       return handle_osd_op(conn, boost::static_pointer_cast<MOSDOp>(m));
     case MSG_OSD_PG_CREATE2:
@@ -853,8 +853,7 @@ bool OSD::require_mon_peer(crimson::net::Connection *conn, Ref<Message> m)
   return true;
 }
 
-seastar::future<> OSD::handle_osd_map(crimson::net::ConnectionRef conn,
-                                      Ref<MOSDMap> m)
+seastar::future<> OSD::handle_osd_map(Ref<MOSDMap> m)
 {
   /* Ensure that only one MOSDMap is processed at a time.  Allowing concurrent
   * processing may eventually be worthwhile, but such an implementation would
@@ -865,15 +864,14 @@ seastar::future<> OSD::handle_osd_map(crimson::net::ConnectionRef conn,
   * simpler invariant for now.
   * See https://tracker.ceph.com/issues/59165
   */
-  return handle_osd_map_lock.lock().then([=, this] {
-    return _handle_osd_map(conn, m);
-  }).finally([=, this] {
+  return handle_osd_map_lock.lock().then([this, m] {
+    return _handle_osd_map(m);
+  }).finally([this] {
     return handle_osd_map_lock.unlock();
   });
 }
 
-seastar::future<> OSD::_handle_osd_map(crimson::net::ConnectionRef conn,
-                                      Ref<MOSDMap> m)
+seastar::future<> OSD::_handle_osd_map(Ref<MOSDMap> m)
 {
   logger().info("handle_osd_map {}", *m);
   if (m->fsid != superblock.cluster_fsid) {
diff --git a/src/crimson/osd/osd.h b/src/crimson/osd/osd.h
index 1069a4b2f2d..abf4a00844d 100644
--- a/src/crimson/osd/osd.h
+++ b/src/crimson/osd/osd.h
@@ -168,10 +168,8 @@ private:
 
   bool require_mon_peer(crimson::net::Connection *conn, Ref<Message> m);
 
-  seastar::future<> handle_osd_map(crimson::net::ConnectionRef conn,
-                                   Ref<MOSDMap> m);
-  seastar::future<> _handle_osd_map(crimson::net::ConnectionRef conn,
-                                    Ref<MOSDMap> m);
+  seastar::future<> handle_osd_map(Ref<MOSDMap> m);
+  seastar::future<> _handle_osd_map(Ref<MOSDMap> m);
   seastar::future<> handle_pg_create(crimson::net::ConnectionRef conn,
 				     Ref<MOSDPGCreate2> m);
   seastar::future<> handle_osd_op(crimson::net::ConnectionRef conn,