osd: fix osd_reqid_t comparison strict weak ordering

The 'l.inc < r.inc' term in operator< lacked an 'l.name == r.name' guard,
breaking antisymmetry, so it was not a valid strict weak ordering.
Replace it with std::tie.

The only ordered container keyed on osd_reqid_t is
ECInject::write_failures0_reqid (QA/debug error injection), so no
production code path is affected and no backport is needed.

Signed-off-by: Sun Yuechi <sunyuechi@iscas.ac.cn>

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 1065066948ee555f6003266447fb60c9fd933be5..977af60bed37485133c5ade6568c825ed62d10a7 100644 (file)
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -28,6 +28,7 @@
 #include <set>
 #include <string>
 #include <string_view>
+#include <tuple>
 #include <variant>
 
 #ifdef WITH_CRIMSON
@@ -240,12 +241,10 @@ inline bool operator!=(const osd_reqid_t& l, const osd_reqid_t& r) {
   return (l.name != r.name) || (l.inc != r.inc) || (l.tid != r.tid);
 }
 inline bool operator<(const osd_reqid_t& l, const osd_reqid_t& r) {
-  return (l.name < r.name) || (l.inc < r.inc) || 
-    (l.name == r.name && l.inc == r.inc && l.tid < r.tid);
+  return std::tie(l.name, l.inc, l.tid) < std::tie(r.name, r.inc, r.tid);
 }
 inline bool operator<=(const osd_reqid_t& l, const osd_reqid_t& r) {
-  return (l.name < r.name) || (l.inc < r.inc) ||
-    (l.name == r.name && l.inc == r.inc && l.tid <= r.tid);
+  return std::tie(l.name, l.inc, l.tid) <= std::tie(r.name, r.inc, r.tid);
 }
 inline bool operator>(const osd_reqid_t& l, const osd_reqid_t& r) { return !(l <= r); }
 inline bool operator>=(const osd_reqid_t& l, const osd_reqid_t& r) { return !(l < r); }