From: wumingqiao <wumingqiao@inspur.com>
Date: Fri, 1 Jun 2018 05:42:41 +0000 (+0800)
Subject: osdc/objecter: remove unused method finish_op
X-Git-Tag: v14.0.1~1197^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F22359%2Fhead;p=ceph.git

osdc/objecter: remove unused method finish_op

Signed-off-by: wumingqiao <wumingqiao@inspur.com>
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 62accf4ed4a..460ac27a471 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -3132,7 +3132,7 @@ void Objecter::_cancel_linger_op(Op *op)
 
 void Objecter::_finish_op(Op *op, int r)
 {
-  ldout(cct, 15) << "finish_op " << op->tid << dendl;
+  ldout(cct, 15) << __func__ << " " << op->tid << dendl;
 
   // op->session->lock is locked unique or op->session is null
 
@@ -3157,22 +3157,6 @@ void Objecter::_finish_op(Op *op, int r)
   op->put();
 }
 
-void Objecter::finish_op(OSDSession *session, ceph_tid_t tid)
-{
-  ldout(cct, 15) << "finish_op " << tid << dendl;
-  shared_lock rl(rwlock);
-
-  OSDSession::unique_lock wl(session->lock);
-
-  map<ceph_tid_t, Op *>::iterator iter = session->ops.find(tid);
-  if (iter == session->ops.end())
-    return;
-
-  Op *op = iter->second;
-
-  _finish_op(op, 0);
-}
-
 MOSDOp *Objecter::_prepare_osd_op(Op *op)
 {
   // rwlock is locked
diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index 0cb9861e3e7..b8cd5e4878a 100644
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -1905,7 +1905,6 @@ public:
   void _send_op(Op *op);
   void _send_op_account(Op *op);
   void _cancel_linger_op(Op *op);
-  void finish_op(OSDSession *session, ceph_tid_t tid);
   void _finish_op(Op *op, int r);
   static bool is_pg_changed(
     int oldprimary,