From 6af4e1f68ef2e882e8dcaa16c49e123ed2479914 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 9 Oct 2014 17:42:14 -0700 Subject: [PATCH] librados: unconditionally pass WATCH_NOTIFY to legacy callback 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 --- src/librados/RadosClient.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc index ffe600b22cbdf..579d2362d164f 100644 --- a/src/librados/RadosClient.cc +++ b/src/librados/RadosClient.cc @@ -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); -- 2.39.5