Skip to content

Commit 1729ffc

Browse files
committed
osd/scrub: use std::ssize() to avoid narrowing conversions
using std::ssize() to avoid a narrowing conversion when using the size of a container as a parameter to a function expecting an int64_t. Signed-off-by: Ronen Friedman <[email protected]>
1 parent f128475 commit 1729ffc

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/osd/scrubber/pg_scrubber.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1504,7 +1504,7 @@ void PgScrubber::apply_snap_mapper_fixes(
15041504

15051505
void PgScrubber::maps_compare_n_cleanup()
15061506
{
1507-
m_pg->add_objects_scrubbed_count(m_be->get_primary_scrubmap().objects.size());
1507+
m_pg->add_objects_scrubbed_count(std::ssize(m_be->get_primary_scrubmap().objects));
15081508

15091509
auto required_fixes =
15101510
m_be->scrub_compare_maps(m_end.is_max(), get_snap_mapper_accessor());

src/osd/scrubber/scrub_reservations.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ void ReplicaReservations::log_success_and_duration()
103103
m_perf_set.tinc(scrbcnt_resrv_successful_elapsed, logged_duration);
104104
m_perf_set.inc(scrbcnt_resrv_success);
105105
m_osds->logger->hinc(
106-
l_osd_scrub_reservation_dur_hist, m_sorted_secondaries.size(),
106+
l_osd_scrub_reservation_dur_hist, std::ssize(m_sorted_secondaries),
107107
logged_duration.count());
108108
m_process_started_at.reset();
109109
}

0 commit comments

Comments
 (0)