Merge pull request #7830 from yuyuyu101/wip-14907

IoCtxImpl: delete C_WatchCB2 when free LingerOp

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

diff --cc src/librados/IoCtxImpl.cc
index 3880e159ab98e545c325ec70ba2020caefd39ca1,229b47b4466d1b625ca8e7a40a9b95e30c72b79d..6180f6711b1a7f9122df092a57db856bba3168bd
--- 1/src/librados/IoCtxImpl.cc
--- 2/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);

diff --cc src/librados/IoCtxImpl.h
Simple merge

diff --cc src/librados/librados.cc
Simple merge