From e10e6e8ae8e4a7eda5c218eb52ebdd0db03f8cb2 Mon Sep 17 00:00:00 2001 From: Zhang Song Date: Wed, 3 Apr 2024 16:02:22 +0800 Subject: [PATCH] crimson/os/seastore: remove unused return value of RecordScanner::scan_valid_records Signed-off-by: Zhang Song (cherry picked from commit 1a914f64070299ab5712ce389096052709b72622) --- src/crimson/os/seastore/async_cleaner.cc | 2 +- src/crimson/os/seastore/journal/circular_bounded_journal.cc | 2 +- src/crimson/os/seastore/journal/segmented_journal.cc | 4 ++-- src/crimson/os/seastore/record_scanner.cc | 6 ++---- src/crimson/os/seastore/record_scanner.h | 3 +-- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/crimson/os/seastore/async_cleaner.cc b/src/crimson/os/seastore/async_cleaner.cc index 053649bedd987..b895a88879f97 100644 --- a/src/crimson/os/seastore/async_cleaner.cc +++ b/src/crimson/os/seastore/async_cleaner.cc @@ -1412,7 +1412,7 @@ SegmentCleaner::scan_extents_ret SegmentCleaner::scan_no_tail_segment( cursor, segment_header.segment_nonce, segments.get_segment_size(), - handler).discard_result(); + handler); }).safe_then([this, segment_id, segment_header] { init_mark_segment_closed( segment_id, diff --git a/src/crimson/os/seastore/journal/circular_bounded_journal.cc b/src/crimson/os/seastore/journal/circular_bounded_journal.cc index a02c745084174..a848811c1f81d 100644 --- a/src/crimson/os/seastore/journal/circular_bounded_journal.cc +++ b/src/crimson/os/seastore/journal/circular_bounded_journal.cc @@ -188,7 +188,7 @@ Journal::replay_ret CircularBoundedJournal::replay_segment( cursor, cjs.get_cbj_header().magic, std::numeric_limits::max(), - dhandler).safe_then([](auto){} + dhandler ).handle_error( replay_ertr::pass_further{}, crimson::ct_error::assert_all{ diff --git a/src/crimson/os/seastore/journal/segmented_journal.cc b/src/crimson/os/seastore/journal/segmented_journal.cc index c40295dbacef4..683481f15b4cb 100644 --- a/src/crimson/os/seastore/journal/segmented_journal.cc +++ b/src/crimson/os/seastore/journal/segmented_journal.cc @@ -219,7 +219,7 @@ SegmentedJournal::scan_last_segment( cursor, nonce, std::numeric_limits::max(), - handler).discard_result(); + handler); }); } @@ -312,7 +312,7 @@ SegmentedJournal::replay_segment( cursor, header.segment_nonce, std::numeric_limits::max(), - dhandler).safe_then([](auto){} + dhandler ).handle_error( replay_ertr::pass_further{}, crimson::ct_error::assert_all{ diff --git a/src/crimson/os/seastore/record_scanner.cc b/src/crimson/os/seastore/record_scanner.cc index 9778bbb77d551..77f7cb422acf6 100644 --- a/src/crimson/os/seastore/record_scanner.cc +++ b/src/crimson/os/seastore/record_scanner.cc @@ -98,10 +98,8 @@ RecordScanner::scan_valid_records( return seastar::stop_iteration::no; } }); - }).safe_then([retref=std::move(retref)]() mutable -> scan_valid_records_ret { - return scan_valid_records_ret( - scan_valid_records_ertr::ready_future_marker{}, - std::move(*retref)); + }).safe_then([retref=std::move(retref)] { + return scan_valid_records_ertr::make_ready_future(); }); } diff --git a/src/crimson/os/seastore/record_scanner.h b/src/crimson/os/seastore/record_scanner.h index 2cbc7c56251e1..2cb17af8df9df 100644 --- a/src/crimson/os/seastore/record_scanner.h +++ b/src/crimson/os/seastore/record_scanner.h @@ -14,8 +14,7 @@ class RecordScanner { public: using read_ertr = SegmentManager::read_ertr; using scan_valid_records_ertr = read_ertr; - using scan_valid_records_ret = scan_valid_records_ertr::future< - size_t>; + using scan_valid_records_ret = scan_valid_records_ertr::future<>; using found_record_handler_t = std::function< scan_valid_records_ertr::future<>( record_locator_t record_locator, -- 2.39.5