]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
librados: unconditionally pass WATCH_NOTIFY to legacy callback
authorSage Weil <sage@redhat.com>
Fri, 10 Oct 2014 00:42:14 +0000 (17:42 -0700)
committerSage Weil <sage@redhat.com>
Thu, 4 Dec 2014 18:32:37 +0000 (10:32 -0800)
This was always WATCH_NOTIFY; just pass that explicitly.  No need to
pay attention to what's in the message.

Signed-off-by: Sage Weil <sage@redhat.com>
src/librados/RadosClient.cc

index ffe600b22cbdf273bcd1a52df0af72af250235ce..579d2362d164f891fddb8565fc29f6591e91764a 100644 (file)
@@ -734,7 +734,7 @@ void librados::RadosClient::do_watch_notify(MWatchNotify *m)
       assert(!!wc->watch_ctx ^ !!wc->watch_ctx2);  // only one is defined
       lock.Unlock();
       if (wc->watch_ctx) {
-       wc->watch_ctx->notify(m->opcode, m->ver, m->bl);
+       wc->watch_ctx->notify(WATCH_NOTIFY, m->ver, m->bl);
        // send ACK back to the OSD
        bufferlist empty;
        wc->io_ctx_impl->notify_ack(wc->oid, m->notify_id, m->cookie, empty);