From: runsisi <luo.runbing@zte.com.cn>
Date: Fri, 23 Nov 2018 08:54:45 +0000 (+0800)
Subject: osdc/Objecter: no need null pointer check for op->session anymore
X-Git-Tag: v14.1.0~713^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6a47e0101ca7f882422556f91af82385100d96d6;p=ceph.git

osdc/Objecter: no need null pointer check for op->session anymore

9a5651b refactored the resend logic for linger op, op->session should be
assigned by _recalc_linger_op_target if resend is needed

Signed-off-by: runsisi <luo.runbing@zte.com.cn>
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 9f5610770cf7..5781c4ba0ffc 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -1328,15 +1328,7 @@ void Objecter::handle_osd_map(MOSDMap *m)
   for (list<LingerOp*>::iterator p = need_resend_linger.begin();
        p != need_resend_linger.end(); ++p) {
     LingerOp *op = *p;
-    if (!op->session) {
-      _calc_target(&op->target, nullptr);
-      OSDSession *s = NULL;
-      const int r = _get_session(op->target.osd, &s, sul);
-      ceph_assert(r == 0);
-      ceph_assert(s != NULL);
-      op->session = s;
-      put_session(s);
-    }
+    ceph_assert(op->session);
     if (!op->session->is_homeless()) {
       logger->inc(l_osdc_linger_resend);
       _send_linger(op, sul);