From: Sage Weil <sage@redhat.com>
Date: Thu, 21 Aug 2014 20:38:17 +0000 (-0700)
Subject: librados: drop useless ver arg to _notify_ack
X-Git-Tag: v0.91~156
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=12940c9f86aa57a5a7561705a5178e797a3115b9;p=ceph.git

librados: drop useless ver arg to _notify_ack

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

diff --git a/src/librados/IoCtxImpl.cc b/src/librados/IoCtxImpl.cc
index f5a8a5badce..dcbe032863b 100644
--- a/src/librados/IoCtxImpl.cc
+++ b/src/librados/IoCtxImpl.cc
@@ -1077,12 +1077,12 @@ int librados::IoCtxImpl::watch(const object_t& oid, uint64_t ver,
 /* this is called with IoCtxImpl::lock held */
 int librados::IoCtxImpl::_notify_ack(
   const object_t& oid,
-  uint64_t notify_id, uint64_t ver,
+  uint64_t notify_id,
   uint64_t cookie)
 {
   ::ObjectOperation rd;
   prepare_assert_ops(&rd);
-  rd.notify_ack(notify_id, ver, cookie);
+  rd.notify_ack(notify_id, 0, cookie);
   objecter->read(oid, oloc, rd, snap_seq, (bufferlist*)NULL, 0, 0, 0);
   return 0;
 }
diff --git a/src/librados/IoCtxImpl.h b/src/librados/IoCtxImpl.h
index 76cebf67e3b..0e4a1f044a9 100644
--- a/src/librados/IoCtxImpl.h
+++ b/src/librados/IoCtxImpl.h
@@ -200,9 +200,7 @@ struct librados::IoCtxImpl {
   int watch(const object_t& oid, uint64_t ver, uint64_t *cookie, librados::WatchCtx *ctx);
   int unwatch(const object_t& oid, uint64_t cookie);
   int notify(const object_t& oid, uint64_t ver, bufferlist& bl);
-  int _notify_ack(
-    const object_t& oid, uint64_t notify_id, uint64_t ver,
-    uint64_t cookie);
+  int _notify_ack(const object_t& oid, uint64_t notify_id, uint64_t cookie);
 
   int set_alloc_hint(const object_t& oid,
                      uint64_t expected_object_size,
diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc
index 56f52bb4314..85a93466e4e 100644
--- a/src/librados/RadosClient.cc
+++ b/src/librados/RadosClient.cc
@@ -725,7 +725,7 @@ void librados::RadosClient::do_watch_notify(MWatchNotify *m)
       lock.Lock();
 
       // send ACK back to the OSD
-      wc->io_ctx_impl->_notify_ack(wc->oid, m->notify_id, m->ver, m->cookie);
+      wc->io_ctx_impl->_notify_ack(wc->oid, m->notify_id, m->cookie);
 
       ldout(cct,10) << __func__ << " notify done" << dendl;
       wc->put();