]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Objecter: remove redundant result-check of _calc_target in _map_session. 6840/head
authorxiexingguo <258156334@qq.com>
Mon, 2 Nov 2015 13:46:11 +0000 (21:46 +0800)
committerNathan Cutler <ncutler@suse.com>
Mon, 7 Dec 2015 23:02:07 +0000 (00:02 +0100)
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)

src/osdc/Objecter.cc

index 9a65f2e6007fde62df6d5e37a863a7f12a811ce4..75f88f6ebef3db116e722ff1397282c56c16931b 100644 (file)
@@ -2664,10 +2664,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);
 }