mon: osdmon: simplify maybe_rm_from_pending_blocklists

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 871427881a60f7a203d08373a1ae1e6db9e2976b)

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index a26b23d782381a381e6b74e5fd96d0bee0cef84d..f57a1925dcd56cd05839e7af1fe26ab5ee1a31a4 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -12749,16 +12749,14 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
        auto maybe_rm_from_pending_blocklists = [](const auto& addr,
                                                   auto& blocklist,
                                                   auto& ob, auto& pb) {
-         if (blocklist.count(addr) ||
-             pb.count(addr)) {
-           if (blocklist.count(addr))
-             ob.push_back(addr);
-           else
-             pb.erase(addr);
+         if (blocklist.count(addr)) {
+           ob.push_back(addr);
+           return true;
+         } else if (pb.count(addr)) {
+           pb.erase(addr);
            return true;
-         } else {
-           return false;
          }
+         return false;
        };
        if (maybe_rm_from_pending_blocklists(addr, osdmap.blocklist,
                                             pending_inc.old_blocklist,