crimson: capture this explicitly

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
Signed-off-by: Kefu Chai <tchaikov@gmail.com>

diff --git a/src/crimson/os/seastore/async_cleaner.cc b/src/crimson/os/seastore/async_cleaner.cc
index 153f6d101e4aec0bc765544142dbe8ff8bb1a30c..76d5d42636b129c891f42e150ef4d53f8255804c 100644 (file)
--- a/src/crimson/os/seastore/async_cleaner.cc
+++ b/src/crimson/os/seastore/async_cleaner.cc
@@ -761,7 +761,7 @@ AsyncCleaner::rewrite_dirty_ret AsyncCleaner::rewrite_dirty(
     t,
     limit,
     config.rewrite_dirty_bytes_per_cycle
-  ).si_then([=, &t](auto dirty_list) {
+  ).si_then([=, &t, this](auto dirty_list) {
     LOG_PREFIX(AsyncCleaner::rewrite_dirty);
     DEBUGT("rewrite {} dirty extents", t, dirty_list.size());
     return seastar::do_with(

diff --git a/src/crimson/os/seastore/journal/segmented_journal.cc b/src/crimson/os/seastore/journal/segmented_journal.cc
index 71579ed1a4b50a9acc20880991d6810d7a38ca7e..82eadf80fbae0ca27a820e711837f618e9e3df99 100644 (file)
--- a/src/crimson/os/seastore/journal/segmented_journal.cc
+++ b/src/crimson/os/seastore/journal/segmented_journal.cc
@@ -333,7 +333,7 @@ SegmentedJournal::replay_segment(
         });
       });
     }),
-    [=](auto &cursor, auto &dhandler) {
+    [=, this](auto &cursor, auto &dhandler) {
       return sm_group.scan_valid_records(
        cursor,
        header.segment_nonce,

diff --git a/src/crimson/os/seastore/segment_manager_group.cc b/src/crimson/os/seastore/segment_manager_group.cc
index ff87fda71e7c33921ecd411c5536f7be679b0410..11eebc742f14f11b82ac65be78fe153d5f27fa28 100644 (file)
--- a/src/crimson/os/seastore/segment_manager_group.cc
+++ b/src/crimson/os/seastore/segment_manager_group.cc
@@ -110,9 +110,9 @@ SegmentManagerGroup::scan_valid_records(
   auto retref = std::make_unique<size_t>(0);
   auto &budget_used = *retref;
   return crimson::repeat(
-    [=, &cursor, &budget_used, &handler]() mutable
+    [=, &cursor, &budget_used, &handler, this]() mutable
     -> scan_valid_records_ertr::future<seastar::stop_iteration> {
-      return [=, &handler, &cursor, &budget_used] {
+      return [=, &handler, &cursor, &budget_used, this] {
        if (!cursor.last_valid_header_found) {
          return read_validate_record_metadata(cursor.seq.offset, nonce
          ).safe_then([=, &cursor](auto md) {
@@ -134,12 +134,12 @@ SegmentManagerGroup::scan_valid_records(
              cursor.emplace_record_group(header, std::move(md_bl));
              return scan_valid_records_ertr::now();
            }
-         }).safe_then([=, &cursor, &budget_used, &handler] {
+         }).safe_then([=, &cursor, &budget_used, &handler, this] {
            DEBUG("processing committed record groups until {}, {} pending",
                  cursor.last_committed,
                  cursor.pending_record_groups.size());
            return crimson::repeat(
-             [=, &budget_used, &cursor, &handler] {
+             [=, &budget_used, &cursor, &handler, this] {
                if (cursor.pending_record_groups.empty()) {
                  /* This is only possible if the segment is empty.
                   * A record's last_commited must be prior to its own

diff --git a/src/crimson/osd/shard_services.cc b/src/crimson/osd/shard_services.cc
index 52dcda071b69ed8d4b0f43482a8aa87ab6d61014..7b20baf09a90588de337a146ef6bd659996175f4 100644 (file)
--- a/src/crimson/osd/shard_services.cc
+++ b/src/crimson/osd/shard_services.cc
@@ -666,7 +666,7 @@ seastar::future<> ShardServices::dispatch_context_messages(
       auto& [peer, messages] = osd_messages;
       logger().debug("dispatch_context_messages sending messages to {}", peer);
       return seastar::parallel_for_each(
-        std::move(messages), [=, peer=peer](auto& m) {
+        std::move(messages), [=, peer=peer, this](auto& m) {
         return send_to_osd(peer, std::move(m), local_state.osdmap->get_epoch());
       });
     });

diff --git a/src/crimson/tools/store_nbd/tm_driver.cc b/src/crimson/tools/store_nbd/tm_driver.cc
index 3b7a37889301280dced6a601672f8ec54afc9f8d..26d126ae3efd0a47105844bab017746669e39202 100644 (file)
--- a/src/crimson/tools/store_nbd/tm_driver.cc
+++ b/src/crimson/tools/store_nbd/tm_driver.cc
@@ -97,11 +97,11 @@ seastar::future<bufferlist> TMDriver::read(
   assert(size % (size_t)device->get_block_size() == 0);
   auto blptrret = std::make_unique<bufferlist>();
   auto &blret = *blptrret;
-  return repeat_eagain([=, &blret] {
+  return repeat_eagain([=, &blret, this] {
     return tm->with_transaction_intr(
       Transaction::src_t::READ,
       "read",
-      [=, &blret](auto& t)
+      [=, &blret, this](auto& t)
     {
       return read_extents(t, offset, size
       ).si_then([=, &blret](auto ext_list) {

diff --git a/src/test/crimson/seastore/test_btree_lba_manager.cc b/src/test/crimson/seastore/test_btree_lba_manager.cc
index a562e7d019d8d4fd4705257310f112f7c26e7ed6..113e0308401e0f42215e3f404e22cfb7e4e1a082 100644 (file)
--- a/src/test/crimson/seastore/test_btree_lba_manager.cc
+++ b/src/test/crimson/seastore/test_btree_lba_manager.cc
@@ -255,7 +255,7 @@ struct lba_btree_test : btree_test_base {
   void insert(laddr_t addr, extent_len_t len) {
     ceph_assert(check.count(addr) == 0);
     check.emplace(addr, get_map_val(len));
-    lba_btree_update([=](auto &btree, auto &t) {
+    lba_btree_update([=, this](auto &btree, auto &t) {
       return btree.insert(
        get_op_context(t), addr, get_map_val(len)
       ).si_then([](auto){});
@@ -267,7 +267,7 @@ struct lba_btree_test : btree_test_base {
     ceph_assert(iter != check.end());
     auto len = iter->second.len;
     check.erase(iter++);
-    lba_btree_update([=](auto &btree, auto &t) {
+    lba_btree_update([=, this](auto &btree, auto &t) {
       return btree.lower_bound(
        get_op_context(t), addr
       ).si_then([this, len, addr, &btree, &t](auto iter) {
@@ -283,7 +283,7 @@ struct lba_btree_test : btree_test_base {
 
   void check_lower_bound(laddr_t addr) {
     auto iter = check.lower_bound(addr);
-    auto result = lba_btree_read([=](auto &btree, auto &t) {
+    auto result = lba_btree_read([=, this](auto &btree, auto &t) {
       return btree.lower_bound(
        get_op_context(t), addr
       ).si_then([](auto iter)
@@ -425,7 +425,7 @@ struct btree_lba_manager_test : btree_test_base {
     paddr_t paddr) {
     auto ret = with_trans_intr(
       *t.t,
-      [=](auto &t) {
+      [=, this](auto &t) {
        return lba_manager->alloc_extent(t, hint, len, paddr);
       }).unsafe_get0();
     logger().debug("alloc'd: {}", *ret);
@@ -459,7 +459,7 @@ struct btree_lba_manager_test : btree_test_base {
 
     auto refcnt = with_trans_intr(
       *t.t,
-      [=](auto &t) {
+      [=, this](auto &t) {
        return lba_manager->decref_extent(
          t,
          target->first);
@@ -483,7 +483,7 @@ struct btree_lba_manager_test : btree_test_base {
     target->second.refcount++;
     auto refcnt = with_trans_intr(
       *t.t,
-      [=](auto &t) {
+      [=, this](auto &t) {
        return lba_manager->incref_extent(
          t,
          target->first);
@@ -521,7 +521,7 @@ struct btree_lba_manager_test : btree_test_base {
 
       auto ret_list = with_trans_intr(
        *t.t,
-       [=](auto &t) {
+       [=, this](auto &t) {
          return lba_manager->get_mappings(
            t, laddr, len);
        }).unsafe_get0();
@@ -533,7 +533,7 @@ struct btree_lba_manager_test : btree_test_base {
 
       auto ret_pin = with_trans_intr(
        *t.t,
-       [=](auto &t) {
+       [=, this](auto &t) {
          return lba_manager->get_mapping(
            t, laddr);
        }).unsafe_get0();
@@ -543,7 +543,7 @@ struct btree_lba_manager_test : btree_test_base {
     }
     with_trans_intr(
       *t.t,
-      [=, &t](auto &) {
+      [=, &t, this](auto &) {
        return lba_manager->scan_mappings(
          *t.t,
          0,