From: Adam C. Emerson <aemerson@redhat.com>
Date: Fri, 11 Nov 2022 01:00:38 +0000 (-0500)
Subject: cls/fifo: Fix `same_or_later()` comparison
X-Git-Tag: v16.2.13~124^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2a7b39ff262a33bf162ab789332ed472893915cc;p=ceph.git

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/58403
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 749f66e7b96..0693ae8549b 100644
--- 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);
   }