From: Casey Bodley Date: Tue, 5 Dec 2023 21:12:56 +0000 (-0500) Subject: osd/scrubber: fix signed comparison warning X-Git-Tag: v19.3.0~425^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=07a4a9bdfc408be027d4bf78d63909efeff38a44;p=ceph.git osd/scrubber: fix signed comparison warning [681/1140] Building CXX object src/osd/CMakeFiles/osd.dir/scrubber/scrub_resources.cc.o src/osd/scrubber/scrub_resources.cc: In member function ‘bool Scrub::ScrubResources::inc_scrubs_remote(pg_t)’: src/osd/scrubber/scrub_resources.cc:84:18: warning: comparison of integer expressions of different signedness: ‘long unsigned int’ and ‘const int64_t’ {aka ‘const long int’} [-Wsign-compare] 84 | if (pre_op_cnt < conf->osd_max_scrubs) { | ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Casey Bodley --- diff --git a/src/osd/scrubber/scrub_resources.cc b/src/osd/scrubber/scrub_resources.cc index 6203a2912aa9..dd9d31a15732 100644 --- a/src/osd/scrubber/scrub_resources.cc +++ b/src/osd/scrubber/scrub_resources.cc @@ -81,7 +81,7 @@ bool ScrubResources::inc_scrubs_remote(pg_t pgid) } auto pre_op_cnt = granted_reservations.size(); - if (pre_op_cnt < conf->osd_max_scrubs) { + if (std::cmp_less(pre_op_cnt, conf->osd_max_scrubs)) { granted_reservations.insert(pgid); log_upwards(fmt::format( "{}: pg[{}] reserved. Remote scrubs count changed from {} -> {} (max "