From ff264ce658445cf47d818c7acf62e905f29daa61 Mon Sep 17 00:00:00 2001 From: Michal Jarzabek Date: Wed, 28 Sep 2016 20:55:39 +0100 Subject: [PATCH] osd/ReplicatedPG: remove unneeded use of count Signed-off-by: Michal Jarzabek --- src/osd/ReplicatedPG.cc | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index cd8d91f598c..67d9852dd36 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -545,8 +545,9 @@ bool ReplicatedPG::is_degraded_or_backfilling_object(const hobject_t& soid) ++i) { if (*i == get_primary()) continue; pg_shard_t peer = *i; - if (peer_missing.count(peer) && - peer_missing[peer].get_items().count(soid)) + auto peer_missing_entry = peer_missing.find(peer); + if (peer_missing_entry != peer_missing.end() && + peer_missing_entry->second.get_items().count(soid)) return true; // Object is degraded if after last_backfill AND @@ -5936,8 +5937,9 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector& ops) for (map >::iterator i = assertions.begin(); i != assertions.end(); ++i) { - bufferlist &bl = out.count(i->first) ? - out[i->first] : empty; + auto out_entry = out.find(i->first); + bufferlist &bl = (out_entry != out.end()) ? + out_entry->second : empty; switch (i->second.second) { case CEPH_OSD_CMPXATTR_OP_EQ: if (!(bl == i->second.first)) { @@ -6665,8 +6667,9 @@ void ReplicatedPG::complete_disconnect_watches( i != to_disconnect.end(); ++i) { pair watcher(i->cookie, i->name); - if (obc->watchers.count(watcher)) { - WatchRef watch = obc->watchers[watcher]; + auto watchers_entry = obc->watchers.find(watcher); + if (watchers_entry != obc->watchers.end()) { + WatchRef watch = watchers_entry->second; dout(10) << "do_osd_op_effects disconnect watcher " << watcher << dendl; obc->watchers.erase(watcher); watch->remove(i->send_disconnect); -- 2.47.3