osd: Fix implicit capture of this warnings

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 0b0cdfc5c559b864bf19db502e47d69112c4798d..740d355b6cbf83fe53ce21c00d0c551d3ae651e5 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -265,7 +265,7 @@ public:
 
   void set_last_scrub_stamp(utime_t t) {
     recovery_state.update_stats(
-      [=](auto &history, auto &stats) {
+      [t](auto &history, auto &stats) {
        set_last_scrub_stamp(t, history, stats);
        return true;
       });
@@ -279,7 +279,7 @@ public:
 
   void set_last_deep_scrub_stamp(utime_t t) {
     recovery_state.update_stats(
-      [=](auto &history, auto &stats) {
+      [t](auto &history, auto &stats) {
        set_last_deep_scrub_stamp(t, history, stats);
        return true;
       });
@@ -292,7 +292,7 @@ public:
 
   void add_objects_scrubbed_count(int64_t count) {
     recovery_state.update_stats(
-      [=](auto &history, auto &stats) {
+      [count](auto &history, auto &stats) {
        add_objects_scrubbed_count(count, stats);
        return true;
       });
@@ -304,7 +304,7 @@ public:
 
   void reset_objects_scrubbed()
   {
-    recovery_state.update_stats([=](auto& history, auto& stats) {
+    recovery_state.update_stats([](auto& history, auto& stats) {
       reset_objects_scrubbed(stats);
       return true;
     });

diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc
index 218224f0b9c23a9d36140e09b9caf2801ff5fc0a..69e8a4961d95647e658b64e06722e6874c2ab332 100644 (file)
--- a/src/osd/PGBackend.cc
+++ b/src/osd/PGBackend.cc
@@ -154,7 +154,7 @@ void PGBackend::handle_recovery_delete(OpRequestRef op)
   ConnectionRef conn = m->get_connection();
 
   gather.set_finisher(new LambdaContext(
-    [=](int r) {
+    [=, this](int r) {
       if (r != -EAGAIN) {
        get_parent()->send_message_osd_cluster(reply, conn.get());
       } else {

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index bf44e7e3901a11818397c91eff9a10e0cc64f74a..47265c169334e454995ce21c0237a25a76bc0fb5 100644 (file)
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -12318,7 +12318,7 @@ int PrimaryLogPG::recover_missing(
     recovering.insert(make_pair(soid, ObjectContextRef()));
     epoch_t cur_epoch = get_osdmap_epoch();
     remove_missing_object(soid, v, new LambdaContext(
-     [=](int) {
+     [=, this](int) {
        std::scoped_lock locker{*this};
        if (!pg_has_reset_since(cur_epoch)) {
         bool object_missing = false;
@@ -12401,7 +12401,7 @@ void PrimaryLogPG::remove_missing_object(const hobject_t &soid,
 
   epoch_t cur_epoch = get_osdmap_epoch();
   t.register_on_complete(new LambdaContext(
-     [=](int) {
+     [=, this](int) {
        std::unique_lock locker{*this};
        if (!pg_has_reset_since(cur_epoch)) {
         ObjectStore::Transaction t2;
@@ -12564,7 +12564,7 @@ void PrimaryLogPG::do_update_log_missing(OpRequestRef &op)
   eversion_t new_lcod = info.last_complete;
 
   Context *complete = new LambdaContext(
-    [=](int) {
+    [=, this](int) {
       const MOSDPGUpdateLogMissing *msg = static_cast<const MOSDPGUpdateLogMissing*>(
        op->get_req());
       std::scoped_lock locker{*this};
@@ -15300,7 +15300,7 @@ bool PrimaryLogPG::agent_choose_mode(bool restart, OpRequestRef op)
            << TierAgentState::get_flush_mode_name(flush_mode)
            << dendl;
     recovery_state.update_stats(
-      [=](auto &history, auto &stats) {
+      [=, this](auto &history, auto &stats) {
        if (flush_mode == TierAgentState::FLUSH_MODE_HIGH) {
          osd->agent_inc_high_count();
          stats.stats.sum.num_flush_mode_high = 1;
@@ -15336,7 +15336,7 @@ bool PrimaryLogPG::agent_choose_mode(bool restart, OpRequestRef op)
       requeued = true;
     }
     recovery_state.update_stats(
-      [=](auto &history, auto &stats) {
+      [=, this](auto &history, auto &stats) {
        if (evict_mode == TierAgentState::EVICT_MODE_SOME) {
          stats.stats.sum.num_evict_mode_some = 1;
        } else if (evict_mode == TierAgentState::EVICT_MODE_FULL) {

diff --git a/src/osd/scrubber/PrimaryLogScrub.cc b/src/osd/scrubber/PrimaryLogScrub.cc
index fb610fde74c82444956ad12aa0126a2289c31b95..a868dd55e340f25d30a10ad1841bdb0656b1d349 100644 (file)
--- a/src/osd/scrubber/PrimaryLogScrub.cc
+++ b/src/osd/scrubber/PrimaryLogScrub.cc
@@ -117,7 +117,7 @@ void PrimaryLogScrub::_scrub_finish()
           << " m_is_repair: " << m_is_repair << dendl;
 
   if (info.stats.stats_invalid) {
-    m_pl_pg->recovery_state.update_stats([=](auto& history, auto& stats) {
+    m_pl_pg->recovery_state.update_stats([=, this](auto& history, auto& stats) {
       stats.stats = m_scrub_cstat;
       stats.stats_invalid = false;
       return false;