]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: properly execute scrub finish context 20341/head
authorYan, Zheng <zyan@redhat.com>
Sun, 19 Nov 2017 12:25:22 +0000 (20:25 +0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 6 Feb 2018 17:51:09 +0000 (09:51 -0800)
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)

src/mds/MDCache.cc

index 9b111ac5b209388780c4524a9266277511e76a82..b33d498c17655171bfdc4866f9d30388576c6c07 100644 (file)
@@ -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