From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Thu, 30 Oct 2014 04:16:34 +0000 (+0100)
Subject: osd/ReplicatedPG.cc: remove redundant check
X-Git-Tag: v0.89~22^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4fc9428506072705c5e7d5456b81b02ac6661a5e;p=ceph.git

osd/ReplicatedPG.cc: remove redundant check

Fix for:

[src/osd/ReplicatedPG.cc:2171]: (style) Redundant checking of STL
 container element existence before removing it.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index d6ecd9473cfd..55adf12a9f59 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -2326,9 +2326,7 @@ void ReplicatedPG::do_scan(
       }
       peer_backfill_info[from] = bi;
 
-      if (waiting_on_backfill.find(from) != waiting_on_backfill.end()) {
-	waiting_on_backfill.erase(from);
-
+      if (waiting_on_backfill.erase(from)) {
 	if (waiting_on_backfill.empty()) {
 	  assert(peer_backfill_info.size() == backfill_targets.size());
 	  finish_recovery_op(hobject_t::get_max());