]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/scrub: fix level comparison in cmp_*_entries()
authorRonen Friedman <rfriedma@redhat.com>
Thu, 28 May 2026 16:01:24 +0000 (16:01 +0000)
committerRonen Friedman <rfriedma@redhat.com>
Fri, 29 May 2026 04:35:04 +0000 (04:35 +0000)
The existing code was, by mistake, asymmetric.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
src/osd/scrubber/scrub_queue_entry.h

index 87de07131a9c61bba8c3cf772e32fa0b30df7e89..f805d1639df3d2a28b99b1bbcd77b9515d36f056 100644 (file)
@@ -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;
 }