]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
osd/OSDMap.cc: remove unneeded use of count
authorMichal Jarzabek <stiopa@gmail.com>
Sun, 25 Sep 2016 11:35:28 +0000 (12:35 +0100)
committerMichal Jarzabek <stiopa@gmail.com>
Sun, 25 Sep 2016 11:35:28 +0000 (12:35 +0100)
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
src/osd/OSDMap.cc

index 095564e4181590953d6f53ff3d1a112c6e0cd266..565adfbbe59fca8231baad14f090539dcdbf491d 100644 (file)
@@ -1298,9 +1298,13 @@ int OSDMap::apply_incremental(const Incremental &inc)
   for (map<int64_t,string>::const_iterator p = inc.new_pool_names.begin();
        p != inc.new_pool_names.end();
        ++p) {
-    if (pool_name.count(p->first))
-      name_pool.erase(pool_name[p->first]);
-    pool_name[p->first] = p->second;
+    auto pool_name_entry = pool_name.find(p->first);
+    if (pool_name_entry != pool_name.end()) {
+      name_pool.erase(pool_name_entry->second);
+      pool_name_entry->second = p->second;
+    } else {
+      pool_name[p->first] = p->second;
+    }
     name_pool[p->second] = p->first;
   }
   for (set<int64_t>::const_iterator p = inc.old_pools.begin();