From: Yan, Zheng <zyan@redhat.com>
Date: Sun, 19 Nov 2017 12:25:22 +0000 (+0800)
Subject: mds: properly execute scrub finish context
X-Git-Tag: v12.2.3~17^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=655d266944374eea2a846f182cc00193ef4cf4b8;p=ceph.git

mds: properly execute scrub finish context

Bug was introduced by commit 7e52729699 (mds: flush after scrub repairs)

Fixes: http://tracker.ceph.com/issues/22058
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit ff71fbdcbb87ffc9baa02319ff0f336c173c5616)
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 9b111ac5b209..b33d498c1765 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -12114,7 +12114,7 @@ void MDCache::enqueue_scrub_work(MDRequestRef& mdr)
 
   Context *fin = nullptr;
   if (!header->get_recursive()) {
-    cs->take_finisher();
+    fin = cs->take_finisher();
   }
 
   // If the scrub did some repair, then flush the journal at the end of