From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 9 Apr 2018 04:33:32 +0000 (-0400)
Subject: rbd-mirror: image map shut down should reset task context
X-Git-Tag: v13.1.0~312^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=10522f4b4988700a22d33e4621652bf78cf14144;p=ceph.git

rbd-mirror: image map shut down should reset task context

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

diff --git a/src/tools/rbd_mirror/ImageMap.cc b/src/tools/rbd_mirror/ImageMap.cc
index bc226c1c5ac..5a674c9c67c 100644
--- a/src/tools/rbd_mirror/ImageMap.cc
+++ b/src/tools/rbd_mirror/ImageMap.cc
@@ -479,6 +479,7 @@ void ImageMap<I>::shut_down(Context *on_finish) {
 
     if (m_timer_task != nullptr) {
       m_threads->timer->cancel_event(m_timer_task);
+      m_timer_task = nullptr;
     }
   }