cls/fifo: Fix `same_or_later()` comparison

Fix logic error where disjunction was used instead of conjunction.

Fixes: https://tracker.ceph.com/issues/57562
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit dae8e781452311a2ec32fbf443814e43337294d8)
Fixes: https://tracker.ceph.com/issues/58402
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

diff --git a/src/cls/fifo/cls_fifo_types.h b/src/cls/fifo/cls_fifo_types.h
index 8a471828b7a5ac139b8876cebdc53d2aaa5822f0..a0750f06b18f1a27422ac3bdc7c1cb1f8f564178 100644 (file)
--- a/src/cls/fifo/cls_fifo_types.h
+++ b/src/cls/fifo/cls_fifo_types.h
@@ -63,7 +63,7 @@ struct objv {
            ver != rhs.ver);
   }
   bool same_or_later(const objv& rhs) const {
-    return (instance == rhs.instance ||
+    return (instance == rhs.instance &&
            ver >= rhs.ver);
   }