]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osdc: Remove useless condition.
authorJianpeng Ma <jianpeng.ma@intel.com>
Mon, 9 Apr 2018 00:23:20 +0000 (08:23 +0800)
committerJianpeng Ma <jianpeng.ma@intel.com>
Tue, 10 Apr 2018 16:55:18 +0000 (00:55 +0800)
If Op/CommandOp in a OSDSesion, the filed session of Op/CommandOp must
not null. And in _scan_reuqests it always get the unique_lock of OSDSession.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
src/osdc/Objecter.cc

index ec4e0e2e72e0785fbea51fd4c5f142edde886965..f766a4301415bf9ebbd1b062b583831e1b18a83f 100644 (file)
@@ -1097,9 +1097,7 @@ void Objecter::_scan_requests(
        break;
       // -- fall-thru --
     case RECALC_OP_TARGET_NEED_RESEND:
-      if (op->session) {
-       _session_op_remove(op->session, op);
-      }
+      _session_op_remove(op->session, op);
       need_resend[op->tid] = op;
       _op_cancel_map_check(op);
       break;
@@ -1128,9 +1126,7 @@ void Objecter::_scan_requests(
       // -- fall-thru --
     case RECALC_OP_TARGET_NEED_RESEND:
       need_resend_command[c->tid] = c;
-      if (c->session) {
-       _session_command_op_remove(c->session, c);
-      }
+      _session_command_op_remove(c->session, c);
       _command_cancel_map_check(c);
       break;
     case RECALC_OP_TARGET_POOL_DNE: