From 67cc408f444e8782dbb561114a429d281b808c69 Mon Sep 17 00:00:00 2001
From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Fri, 26 Aug 2011 11:43:47 -0700
Subject: [PATCH] librados: watch request should wait for safe response

---
 src/librados.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/librados.cc b/src/librados.cc
index 227022defdc38..679eaa52843f9 100644
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -2427,7 +2427,7 @@ int librados::RadosClient::watch(IoCtxImpl& io, const object_t& oid, uint64_t ve
   Cond cond;
   bool done;
   int r;
-  Context *onack = new C_SafeCond(&mylock, &cond, &done, &r);
+  Context *onfinish = new C_SafeCond(&mylock, &cond, &done, &r);
   eversion_t objver;
 
   lock.Lock();
@@ -2437,7 +2437,7 @@ int librados::RadosClient::watch(IoCtxImpl& io, const object_t& oid, uint64_t ve
   prepare_assert_ops(&io, &rd);
   rd.watch(*cookie, ver, 1);
   bufferlist bl;
-  wc->linger_id = objecter->linger(oid, io.oloc, rd, io.snap_seq, bl, NULL, 0, onack, NULL, &objver);
+  wc->linger_id = objecter->linger(oid, io.oloc, rd, io.snap_seq, bl, NULL, 0, NULL, onfinish, &objver);
   lock.Unlock();
 
   mylock.Lock();
-- 
2.39.5