From: Kefu Chai <kchai@redhat.com>
Date: Sun, 20 Dec 2020 13:44:31 +0000 (+0800)
Subject: crimson/osd: check max_len with size of an omap entry not a boolean
X-Git-Tag: v16.1.0~146^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=183895a15d9b85f7237bb45f85cab9e748a86ea6;p=ceph.git

crimson/osd: check max_len with size of an omap entry not a boolean

this addresses a regression introduced by
011734d06462e3afac60ed5d3c74dd3b6dc790c6

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/osd/replicated_recovery_backend.cc b/src/crimson/osd/replicated_recovery_backend.cc
index 97b1543461f3..4e1b46a14cce 100644
--- a/src/crimson/osd/replicated_recovery_backend.cc
+++ b/src/crimson/osd/replicated_recovery_backend.cc
@@ -511,8 +511,8 @@ ReplicatedRecoveryBackend::read_omap_for_push_op(
       [omap_iter, &max_len, push_op] {
         push_op->omap_entries.emplace(omap_iter->key(), omap_iter->value());
         if (const uint64_t entry_size =
-            omap_iter->key().size() + omap_iter->value().length() > max_len;
-            entry_size >= max_len) {
+	    omap_iter->key().size() + omap_iter->value().length();
+            entry_size > max_len) {
           max_len -= entry_size;
         } else {
           max_len = 0;