From: Sage Weil <sage@redhat.com>
Date: Mon, 17 Nov 2014 15:30:44 +0000 (-0800)
Subject: osdc/Objecter: drop ACK callback for watch
X-Git-Tag: v0.91~94
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e8df0771267a5eb1949226703408040c678d9ce4;p=ceph.git

osdc/Objecter: drop ACK callback for watch

It is semantically useless.

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

diff --git a/src/librados/IoCtxImpl.cc b/src/librados/IoCtxImpl.cc
index 9ebd545c653..f821c2115e1 100644
--- a/src/librados/IoCtxImpl.cc
+++ b/src/librados/IoCtxImpl.cc
@@ -1104,7 +1104,7 @@ int librados::IoCtxImpl::watch(const object_t& oid,
   bufferlist bl;
   objecter->linger_watch(linger_op, wr,
 			 snapc, ceph_clock_now(NULL), bl,
-			 NULL, &onfinish,
+			 &onfinish,
 			 &objver);
   lock->Unlock();
 
diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index a27147f4b3d..2b7fc9962b6 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -636,7 +636,7 @@ ceph_tid_t Objecter::linger_watch(LingerOp *info,
 				  ObjectOperation& op,
 				  const SnapContext& snapc, utime_t mtime,
 				  bufferlist& inbl,
-				  Context *onack, Context *oncommit,
+				  Context *oncommit,
 				  version_t *objver)
 {
   info->is_watch = true;
@@ -647,7 +647,7 @@ ceph_tid_t Objecter::linger_watch(LingerOp *info,
   info->inbl = inbl;
   info->poutbl = NULL;
   info->pobjver = objver;
-  info->on_reg_ack = onack;
+  info->on_reg_ack = NULL;
   info->on_reg_commit = oncommit;
 
   RWLock::WLocker wl(rwlock);
diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index d07103b6045..3b5c0690a5a 100644
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -1997,7 +1997,7 @@ public:
 			  ObjectOperation& op,
 			  const SnapContext& snapc, utime_t mtime,
 			  bufferlist& inbl,
-			  Context *onack, Context *onfinish,
+			  Context *onfinish,
 			  version_t *objver);
   ceph_tid_t linger_notify(LingerOp *info,
 			   ObjectOperation& op,