From: Kefu Chai <kchai@redhat.com>
Date: Wed, 18 Nov 2020 10:03:55 +0000 (+0800)
Subject: crimson/os: do not capture unused variables
X-Git-Tag: v16.1.0~566^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F38152%2Fhead;p=ceph.git

crimson/os: do not capture unused variables

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>
---

diff --git a/src/crimson/os/seastore/journal.cc b/src/crimson/os/seastore/journal.cc
index 7b228445a32b..a991d669a140 100644
--- a/src/crimson/os/seastore/journal.cc
+++ b/src/crimson/os/seastore/journal.cc
@@ -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);
 	});
     });
diff --git a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc
index 3642f76b37a0..703560180785 100644
--- a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc
+++ b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc
@@ -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{},
diff --git a/src/crimson/os/seastore/transaction_manager.cc b/src/crimson/os/seastore/transaction_manager.cc
index d8b543d2dfde..7b86631e2ca7 100644
--- a/src/crimson/os/seastore/transaction_manager.cc
+++ b/src/crimson/os/seastore/transaction_manager.cc
@@ -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));