From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Mon, 23 Oct 2017 13:55:13 +0000 (+0800)
Subject: osdc/Objecter: using session::put() rather than put_session().
X-Git-Tag: v12.2.13~128^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eff2cf3764c3984d1e059aca295b4616bb3d75e3;p=ceph.git

osdc/Objecter: using session::put() rather than put_session().

If using connection::get_priv(), it use session::put rather than
put_session() to reduce reduanant check.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit d485b1bf34e9e6bc7bc189a97f1b86718c5f0da5)
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 447f44f6256..8b7aed696e0 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -3377,7 +3377,7 @@ void Objecter::handle_osd_op_reply(MOSDOpReply *m)
 						    " onnvram" : " ack"))
 		  << " ... stray" << dendl;
     sl.unlock();
-    put_session(s);
+    s->put();
     m->put();
     return;
   }
@@ -3400,7 +3400,7 @@ void Objecter::handle_osd_op_reply(MOSDOpReply *m)
     }
     _session_op_remove(s, op);
     sl.unlock();
-    put_session(s);
+    s->put();
 
     _op_submit(op, sul, NULL);
     m->put();
@@ -3416,7 +3416,7 @@ void Objecter::handle_osd_op_reply(MOSDOpReply *m)
 		    << op->session->con->get_peer_addr() << dendl;
       m->put();
       sl.unlock();
-      put_session(s);
+      s->put();
       return;
     }
   } else {
@@ -3435,7 +3435,7 @@ void Objecter::handle_osd_op_reply(MOSDOpReply *m)
       num_in_flight--;
     _session_op_remove(s, op);
     sl.unlock();
-    put_session(s);
+    s->put();
 
     // FIXME: two redirects could race and reorder
 
@@ -3456,7 +3456,7 @@ void Objecter::handle_osd_op_reply(MOSDOpReply *m)
       num_in_flight--;
     _session_op_remove(s, op);
     sl.unlock();
-    put_session(s);
+    s->put();
 
     op->tid = 0;
     op->target.flags &= ~(CEPH_OSD_FLAG_BALANCE_READS |
@@ -3550,7 +3550,7 @@ void Objecter::handle_osd_op_reply(MOSDOpReply *m)
   }
 
   m->put();
-  put_session(s);
+  s->put();
 }
 
 void Objecter::handle_osd_backoff(MOSDBackoff *m)