From 65fc2053ac70ff5ba36594748a59072033fcaf5b Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Thu, 28 Oct 2021 23:04:23 +0000 Subject: [PATCH] mon: osdmon: simplify maybe_rm_from_pending_blocklists Signed-off-by: Greg Farnum (cherry picked from commit 871427881a60f7a203d08373a1ae1e6db9e2976b) --- src/mon/OSDMonitor.cc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index db5ea6929de01..17b087932515b 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -12752,16 +12752,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, -- 2.39.5