From 0d7242917b5df2c57a4bf368d815e916d3611f61 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 8 Feb 2021 21:45:02 +0800 Subject: [PATCH] crimson/os: do not capture unused variable Signed-off-by: Kefu Chai --- src/crimson/os/seastore/cache.h | 2 +- src/crimson/os/seastore/journal.h | 2 +- .../os/seastore/omap_manager/btree/omap_btree_node_impl.cc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/crimson/os/seastore/cache.h b/src/crimson/os/seastore/cache.h index 9fb4ed9fe83..cb34561fdae 100644 --- a/src/crimson/os/seastore/cache.h +++ b/src/crimson/os/seastore/cache.h @@ -163,7 +163,7 @@ public: offset, length, ref->get_bptr()).safe_then( - [this, ref=std::move(ref)]() mutable { + [ref=std::move(ref)]() mutable { /* TODO: crc should be checked against LBA manager */ ref->last_committed_crc = ref->get_crc32c(); diff --git a/src/crimson/os/seastore/journal.h b/src/crimson/os/seastore/journal.h index 85a665b43d0..20b6cb92f6f 100644 --- a/src/crimson/os/seastore/journal.h +++ b/src/crimson/os/seastore/journal.h @@ -190,7 +190,7 @@ public: return write_record( rsize, std::move(record), handle - ).safe_then([this, rsize, seq](auto addr) { + ).safe_then([rsize, seq](auto addr) { return std::make_pair( addr.add_offset(rsize.mdlength), journal_seq_t{seq, addr}); diff --git a/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc b/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc index 745bb8a7687..6cd47cf4904 100644 --- a/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc +++ b/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc @@ -130,7 +130,7 @@ OMapInnerNode::insert(omap_context_t oc, const std::string &key, const std::stri assert(child_pt != iter_end()); auto laddr = child_pt->get_node_key().laddr; return omap_load_extent(oc, laddr, get_meta().depth - 1).safe_then( - [this, oc, child_pt, &key, &value] (auto extent) { + [oc, &key, &value] (auto extent) { return extent->insert(oc, key, value); }).safe_then([this, oc, child_pt] (auto mresult) { if (mresult.status == mutation_status_t::SUCCESS) { @@ -338,7 +338,7 @@ OMapInnerNode::merge_entry(omap_context_t oc, internal_iterator_t iter, OMapNode journal_inner_remove(riter, maybe_get_delta_buffer()); //retire extent std::vector dec_laddrs {l->get_laddr(), r->get_laddr()}; - return dec_ref(oc, dec_laddrs).safe_then([this, oc] { + return dec_ref(oc, dec_laddrs).safe_then([this] { if (extent_is_below_min()) { return merge_entry_ret( merge_entry_ertr::ready_future_marker{}, -- 2.39.5