From: Sage Weil <sage@redhat.com>
Date: Wed, 10 Dec 2014 17:44:01 +0000 (-0800)
Subject: osdc/Objecter: pass correct cookie value to error
X-Git-Tag: v0.91~69
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6f43c6c53a4e7b898c2cc4beb5d345f27af33e7f;p=ceph.git

osdc/Objecter: pass correct cookie value to error

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

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index fc2c67441ef1..88b7d304dbef 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -498,7 +498,7 @@ struct C_DoWatchError : public Context {
     info->_queued_async();
   }
   void finish(int r) {
-    info->watch_context->handle_error(info->linger_id, err);
+    info->watch_context->handle_error(info->get_cookie(), err);
     info->finished_async();
     info->put();
   }