From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 29 Apr 2016 13:39:34 +0000 (-0500)
Subject: Merge pull request #7830 from yuyuyu101/wip-14907
X-Git-Tag: v11.0.0~797
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f6f5515273a21d42c02c09e69d8c47c0e3a8eedd;p=ceph.git

Merge pull request #7830 from yuyuyu101/wip-14907

IoCtxImpl: delete C_WatchCB2 when free LingerOp

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

f6f5515273a21d42c02c09e69d8c47c0e3a8eedd
diff --cc src/librados/IoCtxImpl.cc
index 3880e159ab98,229b47b4466d..6180f6711b1a
--- a/src/librados/IoCtxImpl.cc
+++ b/src/librados/IoCtxImpl.cc
@@@ -1461,8 -1314,10 +1468,8 @@@ int librados::IoCtxImpl::aio_watch(cons
    Context *oncomplete = new C_aio_linger_Complete(c, linger_op, false);
  
    ::ObjectOperation wr;
 -  version_t objver;
 -
    *handle = linger_op->get_cookie();
-   linger_op->watch_context = new WatchInfo(this, oid, ctx, ctx2);
+   linger_op->watch_context = new WatchInfo(this, oid, ctx, ctx2, internal);
  
    prepare_assert_ops(&wr);
    wr.watch(*handle, CEPH_OSD_WATCH_OP_WATCH);