From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Fri, 25 Mar 2016 02:09:29 +0000 (+0800)
Subject: osd/pg: fold sanity check into one single "if" qualification
X-Git-Tag: v10.1.1~98^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=be3ebd8fe56419aad837832bbb0873ae16ce09d1;p=ceph.git

osd/pg: fold sanity check into one single "if" qualification

Just as "boost::statechart::result
PG::RecoveryState::WaitRemoteBackfillReserved::react(const RemoteBackfillReserved &evt)"
does.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index e5d076a72842..e7974df77a05 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -6388,9 +6388,6 @@ PG::RecoveryState::WaitRemoteRecoveryReserved::react(const RemoteRecoveryReserve
 
   if (remote_recovery_reservation_it != context< Active >().remote_shards_to_reserve_recovery.end()) {
     assert(*remote_recovery_reservation_it != pg->pg_whoami);
-  }
-
-  if (remote_recovery_reservation_it != context< Active >().remote_shards_to_reserve_recovery.end()) {
     ConnectionRef con = pg->osd->get_con_osd_cluster(
       remote_recovery_reservation_it->osd, pg->get_osdmap()->get_epoch());
     if (con) {