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 9ebd545c6532539b6a96ca005e5842f3faf708c0..f821c2115e1e62eef2e95c1fa4b41a93066b4233 100644 (file)
--- 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 a27147f4b3d29b0c8ddc1a81e227dc3b3c03acef..2b7fc9962b675610ca71ea97a35e6d9657467b29 100644 (file)
--- 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 d07103b60454733b9bd2d084b11bf991bb963361..3b5c0690a5a739a0316b45bca1d0bd4575223aec 100644 (file)
--- 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,