]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/os: do not capture unused variables 38152/head
authorKefu Chai <kchai@redhat.com>
Wed, 18 Nov 2020 10:03:55 +0000 (18:03 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 18 Nov 2020 10:05:29 +0000 (18:05 +0800)
silences warnings reported by clang iike:

btree_lba_manager.cc:439:50: warning: lambda capture 't' is not used [-Wunused-lambda-capture]
        lba_node->get_node_meta().depth).safe_then([=, &t](LBANodeRef c) {
                                                     ~~~^
1 warning generated.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/crimson/os/seastore/journal.cc
src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc
src/crimson/os/seastore/transaction_manager.cc

index 7b228445a32bedfbad49348ab3621cc1d0b7a97f..a991d669a140085fded3c0af22452e4dee8052ea 100644 (file)
@@ -157,8 +157,7 @@ Journal::roll_journal_segment()
 
   return (current_journal_segment ?
          current_journal_segment->close() :
-         Segment::close_ertr::now()).safe_then(
-    [this, old_segment_id] {
+         Segment::close_ertr::now()).safe_then([this] {
       return segment_provider->get_segment();
     }).safe_then([this](auto segment) {
       return segment_manager.open(segment);
@@ -508,7 +507,7 @@ Journal::scan_segment_ret Journal::scan_segment(
                [=, &current](auto &header, auto &bl) {
                  return scan_segment_ertr::now(
                  ).safe_then(
-                   [=, &current, &header, &bl]()
+                   [=, &header, &bl]()
                    -> scan_segment_ertr::future<> {
                    if (!delta_handler) {
                      return scan_segment_ertr::now();
@@ -579,7 +578,7 @@ Journal::scan_segment_ret Journal::scan_segment(
                  }
                });
            });
-       }).safe_then([this, &current] {
+       }).safe_then([&current] {
          return scan_segment_ertr::make_ready_future<paddr_t>(current);
        });
     });
index 3642f76b37a0506b6089df32c21362430a2f997b..703560180785590d2587cb8b432dc9f7914b2af2 100644 (file)
@@ -436,7 +436,7 @@ BtreeLBAManager::get_physical_extent_if_live(
       return root->lookup(
        op_context_t{cache, pin_set, t},
        lba_node->get_node_meta().begin,
-       lba_node->get_node_meta().depth).safe_then([=, &t](LBANodeRef c) {
+       lba_node->get_node_meta().depth).safe_then([=](LBANodeRef c) {
          if (c->get_paddr() == lba_node->get_paddr()) {
            return get_physical_extent_if_live_ret(
              get_physical_extent_if_live_ertr::ready_future_marker{},
index d8b543d2dfde307836beefdd48cd0134eb3afc3d..7b86631e2ca7c0657437e4ee22910c2f461fa099 100644 (file)
@@ -272,7 +272,7 @@ TransactionManager::get_extent_if_live_ret TransactionManager::get_extent_if_liv
            addr,
            laddr,
            len).safe_then(
-             [this, &t, pin=std::move(pin)](CachedExtentRef ret) mutable {
+             [this, pin=std::move(pin)](CachedExtentRef ret) mutable {
                auto lref = ret->cast<LogicalCachedExtent>();
                if (!lref->has_pin()) {
                  lref->set_pin(std::move(pin));