From: Kefu Chai <kchai@redhat.com>
Date: Thu, 16 Jul 2020 12:40:16 +0000 (+0800)
Subject: crimson: do not capture unused variables
X-Git-Tag: v16.1.0~1704^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1b8cdbee021ada4d8595905b3ee09dd5d8b675a2;p=ceph.git

crimson: do not capture unused variables

this change silences warnings like:

mson/osd/backfill_state.cc:131:11: warning: lambda capture 'this' is not used [-Wunused-lambda-capture]
      [&, this](const pg_log_entry_t& e) {
        ~~^~~~

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

diff --git a/src/crimson/osd/backfill_state.cc b/src/crimson/osd/backfill_state.cc
index 7c66013e18c9..1ffadd4e8483 100644
--- a/src/crimson/osd/backfill_state.cc
+++ b/src/crimson/osd/backfill_state.cc
@@ -128,7 +128,7 @@ void BackfillState::Enqueuing::maybe_update_range()
                    pg().get_projected_last_update());
     logger().debug("{}: scanning pg log first", __func__);
     peering_state().get_pg_log().get_log().scan_log_after(primary_bi.version,
-      [&, this](const pg_log_entry_t& e) {
+      [&](const pg_log_entry_t& e) {
         logger().debug("maybe_update_range(lambda): updating from version {}",
                        e.version);
         if (e.soid >= primary_bi.begin && e.soid <  primary_bi.end) {
@@ -198,7 +198,7 @@ bool BackfillState::Enqueuing::should_rescan_replicas(
 {
   const auto& targets = peering_state().get_backfill_targets();
   return std::any_of(std::begin(targets), std::end(targets),
-    [&, this] (const auto& bt) {
+    [&] (const auto& bt) {
       return ReplicasScanning::replica_needs_scan(peer_backfill_info.at(bt),
                                                   backfill_info);
     });
@@ -218,7 +218,7 @@ void BackfillState::Enqueuing::trim_backfilled_object_from_intervals(
   std::map<pg_shard_t, BackfillInterval>& peer_backfill_info)
 {
   std::for_each(std::begin(result.pbi_targets), std::end(result.pbi_targets),
-    [this, &peer_backfill_info] (const auto& bt) {
+    [&peer_backfill_info] (const auto& bt) {
       peer_backfill_info.at(bt).pop_front();
     });
   last_backfill_started = std::move(result.new_last_backfill_started);
diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc
index e4fb16cc9f11..8f6b14ec72e8 100644
--- a/src/crimson/osd/osd.cc
+++ b/src/crimson/osd/osd.cc
@@ -1055,7 +1055,7 @@ seastar::future<> OSD::send_incremental_map(crimson::net::Connection* conn,
     });
   } else {
     return load_map_bl(osdmap->get_epoch())
-    .then([this, conn, first](auto&& bl) mutable {
+    .then([this, conn](auto&& bl) mutable {
       auto m = make_message<MOSDMap>(monc->get_fsid(),
 	  osdmap->get_encoding_features());
       m->oldest_map = superblock.oldest_map;