From b758df7f66fa968b6bdded05019c0d06ec4298d2 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 5 Jul 2021 22:53:53 +0800 Subject: [PATCH] crimson/os/seastore: capture variables explicitly less error prune this way. Signed-off-by: Kefu Chai --- src/crimson/os/seastore/journal.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/crimson/os/seastore/journal.cc b/src/crimson/os/seastore/journal.cc index 63f0ef2cdec5a..3614fbc73ca5c 100644 --- a/src/crimson/os/seastore/journal.cc +++ b/src/crimson/os/seastore/journal.cc @@ -648,18 +648,18 @@ Journal::scan_extents_ret Journal::scan_extents( extent_len_t bytes_to_read) { auto ret = std::make_unique(); - auto &retref = *ret; + auto* extents = ret.get(); return read_segment_header(cursor.get_offset().segment ).handle_error( scan_extents_ertr::pass_further{}, crimson::ct_error::assert_all{ "Invalid error in Journal::scan_extents" } - ).safe_then([&, bytes_to_read](auto segment_header) { + ).safe_then([bytes_to_read, extents, &cursor, this](auto segment_header) { auto segment_nonce = segment_header.segment_nonce; return seastar::do_with( found_record_handler_t( - [&, bytes_to_read]( + [extents, this]( paddr_t base, const record_header_t &header, const bufferlist &mdbuf) mutable { @@ -677,7 +677,7 @@ Journal::scan_extents_ret Journal::scan_extents( paddr_t extent_offset = base.add_offset(header.mdlength); for (const auto &i : *infos) { - retref.emplace_back(extent_offset, i); + extents->emplace_back(extent_offset, i); extent_offset.offset += i.len; } return scan_extents_ertr::now(); -- 2.39.5