From: Sage Weil <sage@redhat.com>
Date: Sat, 7 Feb 2015 14:50:38 +0000 (-0800)
Subject: osdc/Objecter: remove unused on_reg_ack
X-Git-Tag: v0.93~31^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1faa9471e97e0f5c55239f3fd35bc1c23edb1a5c;p=ceph.git

osdc/Objecter: remove unused on_reg_ack

This is all dead code.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 20f89767226b..61098497d979 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -430,8 +430,6 @@ void Objecter::_send_linger(LingerOp *info)
   } else {
     ldout(cct, 15) << "send_linger " << info->linger_id << " register" << dendl;
     opv = info->ops;
-    if (info->on_reg_ack)
-      onack = new C_Linger_Register(this, info);
     oncommit = new C_Linger_Commit(this, info);
   }
   Op *o = new Op(info->target.base_oid, info->target.base_oloc,
@@ -467,15 +465,6 @@ void Objecter::_send_linger(LingerOp *info)
   logger->inc(l_osdc_linger_send);
 }
 
-void Objecter::_linger_register(LingerOp *info, int r)
-{
-  ldout(cct, 10) << "_linger_register " << info->linger_id << dendl;
-  if (info->on_reg_ack) {
-    info->on_reg_ack->complete(r);
-    info->on_reg_ack = NULL;
-  }
-}
-
 void Objecter::_linger_commit(LingerOp *info, int r) 
 {
   ldout(cct, 10) << "_linger_commit " << info->linger_id << dendl;
@@ -689,7 +678,6 @@ ceph_tid_t Objecter::linger_watch(LingerOp *info,
   info->inbl = inbl;
   info->poutbl = NULL;
   info->pobjver = objver;
-  info->on_reg_ack = NULL;
   info->on_reg_commit = oncommit;
 
   RWLock::WLocker wl(rwlock);
@@ -1389,9 +1377,6 @@ void Objecter::_check_linger_pool_dne(LingerOp *op, bool *need_unregister)
   }
   if (op->map_dne_bound > 0) {
     if (osdmap->get_epoch() >= op->map_dne_bound) {
-      if (op->on_reg_ack) {
-	op->on_reg_ack->complete(-ENOENT);
-      }
       if (op->on_reg_commit) {
 	op->on_reg_commit->complete(-ENOENT);
       }
diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index ff7cb891f72a..ed44be004257 100644
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -1520,7 +1520,7 @@ public:
     uint32_t register_gen;
     bool registered;
     bool canceled;
-    Context *on_reg_ack, *on_reg_commit;
+    Context *on_reg_commit;
 
     // we trigger these from an async finisher
     Context *on_notify_finish;
@@ -1554,7 +1554,7 @@ public:
 		 register_gen(0),
 		 registered(false),
 		 canceled(false),
-		 on_reg_ack(NULL), on_reg_commit(NULL),
+		 on_reg_commit(NULL),
 		 on_notify_finish(NULL),
 		 notify_result_bl(NULL),
 		 watch_context(NULL),
@@ -1577,20 +1577,6 @@ public:
     }
   };
 
-  struct C_Linger_Register : public Context {
-    Objecter *objecter;
-    LingerOp *info;
-    C_Linger_Register(Objecter *o, LingerOp *l) : objecter(o), info(l) {
-      info->get();
-    }
-    ~C_Linger_Register() {
-      info->put();
-    }
-    void finish(int r) {
-      objecter->_linger_register(info, r);
-    }
-  };
-  
   struct C_Linger_Commit : public Context {
     Objecter *objecter;
     LingerOp *info;
@@ -1748,7 +1734,6 @@ public:
 
   void _linger_submit(LingerOp *info);
   void _send_linger(LingerOp *info);
-  void _linger_register(LingerOp *info, int r);
   void _linger_commit(LingerOp *info, int r);
   void _linger_reconnect(LingerOp *info, int r);
   void _send_linger_ping(LingerOp *info);