]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
crimson: do not capture unused variables
authorKefu Chai <kchai@redhat.com>
Tue, 6 Oct 2020 10:58:20 +0000 (18:58 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 6 Oct 2020 11:12:33 +0000 (19:12 +0800)
also silence warnings like:

Signe-off-by: Kefu Chai <kchai@redhat.cop_btree_node.h:103:36: warning: lambda capture 'this' is not used [-Wunused-lambda-capture]
                                  [this, ec, len, &extents] (auto i) {
                                   ^

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/crimson/os/seastore/extentmap_manager/btree/extentmap_btree_node.h
src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc
src/crimson/osd/pg.cc
src/crimson/osd/replicated_recovery_backend.cc

index 97d43f0d4ac308dd63b770bcc6de14fb9428b3ab..f0e57c40aff5c56d011efbe017b7fef2696db860 100644 (file)
@@ -100,7 +100,7 @@ struct ExtMapNode : LogicalCachedExtent {
       [this, ec, len] (auto &extents) {
       return crimson::do_for_each(boost::make_counting_iterator(0),
                                   boost::make_counting_iterator(2),
-                                  [this, ec, len, &extents] (auto i) {
+                                  [ec, len, &extents] (auto i) {
         return ec.tm.alloc_extent<T>(ec.t, L_ADDR_MIN, len).safe_then(
           [i, &extents](auto &&node) {
                 if (i == 0)
index edc55a0c441679fef0bd0dbaf1d4493c8d9d8a53..f16731dc1df6682cc42a9a7a12e5ad10900b8c17 100644 (file)
@@ -248,7 +248,7 @@ BtreeLBAManager::init_cached_extent_ret BtreeLBAManager::init_cached_extent(
          op_context_t{cache, pin_set, t},
          lban->get_node_meta().begin,
          lban->get_node_meta().depth
-       ).safe_then([this, &t, e=std::move(e)](LBANodeRef c) {
+       ).safe_then([this, e=std::move(e)](LBANodeRef c) {
          if (c->get_paddr() == e->get_paddr()) {
            assert(&*c == &*e);
            logger().debug("init_cached_extent: {} initialized", *e);
@@ -265,7 +265,7 @@ BtreeLBAManager::init_cached_extent_ret BtreeLBAManager::init_cached_extent(
          op_context_t{cache, pin_set, t},
          logn->get_laddr(),
          logn->get_length()).safe_then(
-           [this, &t, logn=std::move(logn)](auto pins) {
+           [this, logn=std::move(logn)](auto pins) {
              if (pins.size() == 1) {
                auto pin = std::move(pins.front());
                pins.pop_front();
index 3aa6a0969636579f09dbce114e8806c779bfd4e2..1dad6ced7d598d8f276282a56e2f7a99b6a2524b 100644 (file)
@@ -624,7 +624,7 @@ seastar::future<Ref<MOSDOpReply>> PG::do_osd_ops(
       *m,
       obc->obs.oi.soid);
     return std::move(*ox).flush_changes(
-      [this, m] (auto&& obc) -> osd_op_errorator::future<> {
+      [m] (auto&& obc) -> osd_op_errorator::future<> {
        logger().debug(
          "do_osd_ops: {} - object {} txn is empty, bypassing mutate",
          *m,
index 4b4e494226b2a1abf6404d39a802744e65403f6c..9e2707f72cc3b7b7648b0d14b9581c5564513f53 100644 (file)
@@ -124,7 +124,7 @@ seastar::future<> ReplicatedRecoveryBackend::load_obc_for_recovery(
     return seastar::now();
   }
   return pg.get_or_load_head_obc(soid).safe_then(
-    [&recovery_waiter, pulled](auto p) {
+    [&recovery_waiter](auto p) {
     auto& [obc, existed] = p;
     logger().debug("load_obc_for_recovery: loaded obc: {}", obc->obs.oi.soid);
     recovery_waiter.obc = obc;