From: xiexingguo <258156334@qq.com>
Date: Mon, 2 Nov 2015 13:46:11 +0000 (+0800)
Subject: Objecter: remove redundant result-check of _calc_target in _map_session.
X-Git-Tag: v0.94.6~39^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6cf261cd2e80adbaf2898cb354c8159a57749e9d;p=ceph.git

Objecter: remove redundant result-check of _calc_target in _map_session.

Result-code check is currently redundant since _calc_target never returns a negative value.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

(cherry picked from commit 5a6117e667024f51e65847f73f7589467b6cb762)
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 3861879421ac..2b5a979f8239 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -2560,10 +2560,7 @@ int Objecter::_calc_target(op_target_t *t, epoch_t *last_force_resend,  bool any
 int Objecter::_map_session(op_target_t *target, OSDSession **s,
 			   RWLock::Context& lc)
 {
-  int r = _calc_target(target);
-  if (r < 0) {
-    return r;
-  }
+  _calc_target(target);
   return _get_session(target->osd, s, lc);
 }