From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 23 Feb 2016 18:14:23 +0000 (-0500)
Subject: Merge pull request #7667 from jdurgin/wip-14780
X-Git-Tag: v10.1.0~329
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=76dc44713d85bf2603b5b145def3407c8e37c80f;p=ceph.git

Merge pull request #7667 from jdurgin/wip-14780

Revert "librbd: use task finisher per CephContext"

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

76dc44713d85bf2603b5b145def3407c8e37c80f
diff --cc src/librbd/ImageWatcher.cc
index b1786f7e18ee,1e0b23c584b7..3510028e281d
--- a/src/librbd/ImageWatcher.cc
+++ b/src/librbd/ImageWatcher.cc
@@@ -38,12 -34,10 +38,11 @@@ ImageWatcher::ImageWatcher(ImageCtx &im
      m_watch_lock(util::unique_lock_name("librbd::ImageWatcher::m_watch_lock", this)),
      m_watch_ctx(*this), m_watch_handle(0),
      m_watch_state(WATCH_STATE_UNREGISTERED),
+     m_task_finisher(new TaskFinisher<Task>(*m_image_ctx.cct)),
      m_async_request_lock(util::unique_lock_name("librbd::ImageWatcher::m_async_request_lock", this)),
 -    m_owner_client_id_lock(util::unique_lock_name("librbd::ImageWatcher::m_owner_client_id_lock", this))
 +    m_owner_client_id_lock(util::unique_lock_name("librbd::ImageWatcher::m_owner_client_id_lock", this)),
 +    m_notifier(image_ctx)
  {
-   m_image_ctx.cct->lookup_or_create_singleton_object<TaskFinisher<Task> >(
-     m_task_finisher, "librbd::task_finisher");
  }
  
  ImageWatcher::~ImageWatcher()