From: Ronen Friedman Date: Thu, 28 May 2026 16:01:24 +0000 (+0000) Subject: osd/scrub: fix level comparison in cmp_*_entries() X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=22b2db4351eb45352861768a49d3399095060e52;p=ceph.git osd/scrub: fix level comparison in cmp_*_entries() The existing code was, by mistake, asymmetric. Signed-off-by: Ronen Friedman --- diff --git a/src/osd/scrubber/scrub_queue_entry.h b/src/osd/scrubber/scrub_queue_entry.h index 87de07131a9..f805d1639df 100644 --- a/src/osd/scrubber/scrub_queue_entry.h +++ b/src/osd/scrubber/scrub_queue_entry.h @@ -107,8 +107,8 @@ static inline std::weak_ordering cmp_ripe_entries( cmp != 0) { return cmp; } - if (r.level < l.level) { - return std::weak_ordering::less; + if (auto cmp = r.level <=> l.level; cmp != 0) { + return cmp; } if (auto cmp = std::weak_order( double(l.schedule.not_before), double(r.schedule.not_before)); @@ -136,8 +136,8 @@ static inline std::weak_ordering cmp_future_entries( cmp != 0) { return cmp; } - if (r.level < l.level) { - return std::weak_ordering::less; + if (auto cmp = r.level <=> l.level; cmp != 0) { + return cmp; } return std::weak_ordering::greater; }