Crimson: cleanup Clang issues in Crimson code

Mostly: remove redundant captures

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

diff --git a/src/crimson/admin/admin_socket.cc b/src/crimson/admin/admin_socket.cc
index 307ea6b033a8241abcfef9b0126d30e75d2f3f2c..238ddc9989603235b8c0ff60cb1174d3cd97faa3 100644 (file)
--- a/src/crimson/admin/admin_socket.cc
+++ b/src/crimson/admin/admin_socket.cc
@@ -131,7 +131,7 @@ seastar::future<> AdminSocket::handle_command(crimson::net::Connection* conn,
                                              boost::intrusive_ptr<MCommand> m)
 {
   return execute_command(m->cmd, std::move(m->get_data())).then(
-    [conn, tid=m->get_tid(), this](auto result) {
+    [conn, tid=m->get_tid()](auto result) {
     auto [ret, err, out] = std::move(result);
     auto reply = make_message<MCommandReply>(ret, err);
     reply->set_tid(tid);

diff --git a/src/crimson/os/cyanstore/cyan_store.cc b/src/crimson/os/cyanstore/cyan_store.cc
index e99e72c8f9973d0280d072af567a9bce0d470cc6..77c9799755dd22898bf34905c83606ec81f01630 100644 (file)
--- a/src/crimson/os/cyanstore/cyan_store.cc
+++ b/src/crimson/os/cyanstore/cyan_store.cc
@@ -210,7 +210,7 @@ CyanStore::read_errorator::future<ceph::bufferlist> CyanStore::readv(
     return crimson::do_for_each(m,
       [this, ch, oid, op_flags, &bl](auto& p) {
       return read(ch, oid, p.first, p.second, op_flags)
-      .safe_then([this, &bl](auto ret) {
+      .safe_then([&bl](auto ret) {
        bl.claim_append(ret);
       });
     }).safe_then([&bl] {

diff --git a/src/crimson/os/seastore/cache.cc b/src/crimson/os/seastore/cache.cc
index b6795244655db1ecf906c4b6f4a40f5f2d27cab4..cfb82049042712e284a6519729731ba4790340ba 100644 (file)
--- a/src/crimson/os/seastore/cache.cc
+++ b/src/crimson/os/seastore/cache.cc
@@ -192,7 +192,7 @@ Cache::replay_delta(paddr_t record_base, const delta_info_t &delta)
       logger().debug("replay_delta: finished reading root at {}", root_location);
       root = ref;
       return root->complete_load();
-    }).safe_then([this, root_location] {
+    }).safe_then([root_location] {
       logger().debug("replay_delta: finished loading root at {}", root_location);
       return replay_delta_ret(replay_delta_ertr::ready_future_marker{});
     });
@@ -209,7 +209,7 @@ Cache::get_root_ret Cache::get_root(Transaction &t)
       t.root);
   } else {
     auto ret = root;
-    return ret->wait_io().then([this, &t, ret] {
+    return ret->wait_io().then([ret] {
       return get_root_ret(
        get_root_ertr::ready_future_marker{},
        ret);

diff --git a/src/crimson/os/seastore/cache.h b/src/crimson/os/seastore/cache.h
index b8c3fe2d2c0be01245195a25ab79c0032e091372..ed86526f26a52a05e0cb777742e0f4a26c3c9461 100644 (file)
--- a/src/crimson/os/seastore/cache.h
+++ b/src/crimson/os/seastore/cache.h
@@ -191,7 +191,7 @@ public:
        offset,
        length,
        ref->get_bptr()).safe_then(
-         [this, ref=std::move(ref)]() mutable {
+         [ref=std::move(ref)]() mutable {
            ref->complete_io();
            return get_extent_ertr::make_ready_future<TCachedExtentRef<T>>(
              std::move(ref));

diff --git a/src/crimson/osd/ops_executer.cc b/src/crimson/osd/ops_executer.cc
index d67387ce8eff85acdb53a8cb9f6c8e343fddbe68..77f4d4c4353fe1b1dca3c016a532c97557a8dd7b 100644 (file)
--- a/src/crimson/osd/ops_executer.cc
+++ b/src/crimson/osd/ops_executer.cc
@@ -569,7 +569,7 @@ static seastar::future<ceph::bufferlist> do_pgnls_common(
               std::make_tuple(std::move(items), std::move(next)));
       });
   }).then(
-    [pg_end, filter] (auto&& ret) {
+    [pg_end] (auto&& ret) {
       auto& [items, next] = ret;
       auto is_matched = [] (const auto& obj) {
         return !obj.is_min();
@@ -815,7 +815,7 @@ static seastar::future<ceph::bufferlist> do_pgls_common(
             if (!obj.is_min()) {
               entries.emplace_back(obj.oid, obj.get_key());
             }
-            return entries;
+            return std::move(entries);
           }),
         seastar::make_ready_future<hobject_t>(next));
     }).then([pg_end](entries_t entries, hobject_t next) {

diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h
index c10139bff762d291509a330257d9222312985edd..3bfeb23c16a2e7f30a39a63ade1fbdf97053b676 100644 (file)
--- a/src/crimson/osd/pg.h
+++ b/src/crimson/osd/pg.h
@@ -507,7 +507,7 @@ public:
     auto [oid, type] = get_oid_and_lock(*m, op_info);
     return get_locked_obc(op, oid, type)
       .safe_then([this, f=std::forward<F>(f), type=type](auto obc) {
-       return f(obc).finally([this, obc, type=type] {
+       return f(obc).finally([obc, type=type] {
          obc->put_lock_type(type);
          return load_obc_ertr::now();
        });

diff --git a/src/test/crimson/seastore/test_seastore_journal.cc b/src/test/crimson/seastore/test_seastore_journal.cc
index 309d5a2d9bd02d099628464562b6dc37ce51039c..02c22e84c72787e324a4836b3d5ec38d9b91fa02 100644 (file)
--- a/src/test/crimson/seastore/test_seastore_journal.cc
+++ b/src/test/crimson/seastore/test_seastore_journal.cc
@@ -129,9 +129,7 @@ struct journal_test_t : seastar_test_suite_t, JournalSegmentProvider {
     };
     advance();
     replay(
-      [this,
-       &advance,
-       &record_iter,
+      [&advance,
        &delta_checker]
       (auto base, const auto &di) mutable {
        if (!delta_checker) {

diff --git a/src/test/crimson/test_messenger.cc b/src/test/crimson/test_messenger.cc
index 16e7b4d0ffba2f31b109faddc1ea8b0ce70f387c..deb06990329134bb577fbf5006e72b5e2e86967e 100644 (file)
--- a/src/test/crimson/test_messenger.cc
+++ b/src/test/crimson/test_messenger.cc
@@ -405,7 +405,7 @@ seastar::future<> test_preemptive_shutdown(bool v2) {
         // forwarded to stopped_send_promise
         (void) seastar::do_until(
           [this] { return stop_send; },
-          [this, conn] {
+          [conn] {
             return conn->send(make_message<MPing>()).then([] {
               return seastar::sleep(0ms);
             });
@@ -641,7 +641,7 @@ struct TestInterceptor : public Interceptor {
   seastar::future<> wait() {
     assert(!signal);
     signal = seastar::abort_source();
-    return seastar::sleep_abortable(10s, *signal).then([this] {
+    return seastar::sleep_abortable(10s, *signal).then([] {
       throw std::runtime_error("Timeout (10s) in TestInterceptor::wait()");
     }).handle_exception_type([] (const seastar::sleep_aborted& e) {
       // wait done!
@@ -1230,7 +1230,7 @@ class FailoverTest : public Dispatcher {
     recv_pong = seastar::promise<>();
     auto fut = recv_pong->get_future();
     return cmd_conn->send(make_message<MPing>()
-    ).then([this, fut = std::move(fut)] () mutable {
+    ).then([fut = std::move(fut)] () mutable {
       return std::move(fut);
     });
   }
@@ -1259,7 +1259,7 @@ class FailoverTest : public Dispatcher {
     assert(!recv_cmdreply);
     auto m = make_message<MCommand>();
     m->cmd.emplace_back(1, static_cast<char>(cmd_t::shutdown));
-    return cmd_conn->send(m).then([this] {
+    return cmd_conn->send(m).then([] {
       return seastar::sleep(200ms);
     }).finally([this] {
       return cmd_msgr->shutdown();
@@ -1625,7 +1625,7 @@ test_v2_lossy_early_connect_fault(FailoverTest& test) {
           interceptor,
           policy_t::lossy_client,
           policy_t::stateless_server,
-          [&test] (FailoverSuite& suite) {
+          [] (FailoverSuite& suite) {
         return seastar::futurize_invoke([&suite] {
           return suite.send_peer();
         }).then([&suite] {
@@ -1657,7 +1657,7 @@ test_v2_lossy_connect_fault(FailoverTest& test) {
           interceptor,
           policy_t::lossy_client,
           policy_t::stateless_server,
-          [&test] (FailoverSuite& suite) {
+          [] (FailoverSuite& suite) {
         return seastar::futurize_invoke([&suite] {
           return suite.send_peer();
         }).then([&suite] {
@@ -2160,7 +2160,7 @@ test_v2_peer_connect_fault(FailoverTest& test) {
           interceptor,
           policy_t::lossless_peer,
           policy_t::lossless_peer,
-          [&test] (FailoverSuite& suite) {
+          [] (FailoverSuite& suite) {
         return seastar::futurize_invoke([&suite] {
           return suite.send_peer();
         }).then([&suite] {
@@ -2248,7 +2248,7 @@ test_v2_peer_connected_fault_reconnect(FailoverTest& test) {
       interceptor,
       policy_t::lossless_peer,
       policy_t::lossless_peer,
-      [&test] (FailoverSuite& suite) {
+      [] (FailoverSuite& suite) {
     return seastar::futurize_invoke([&suite] {
       return suite.send_peer();
     }).then([&suite] {
@@ -2301,7 +2301,7 @@ peer_wins(FailoverTest& test) {
                           TestInterceptor(),
                           policy_t::lossy_client,
                           policy_t::stateless_server,
-                          [&test, &ret] (FailoverSuite& suite) {
+                          [&ret] (FailoverSuite& suite) {
       return suite.connect_peer().then([&suite] {
         return suite.wait_results(1);
       }).then([&ret] (ConnResults& results) {
@@ -2760,7 +2760,7 @@ test_v2_stale_reaccept(FailoverTest& test) {
       return test.peer_connect_me();
     }).then([&suite] {
       return suite.wait_blocked();
-    }).then([&suite] {
+    }).then([] {
       logger().info("[Test] block the broken REPLACING for 210ms...");
       return seastar::sleep(210ms);
     }).then([&suite] {