From 655d266944374eea2a846f182cc00193ef4cf4b8 Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Sun, 19 Nov 2017 20:25:22 +0800 Subject: [PATCH] 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" (cherry picked from commit ff71fbdcbb87ffc9baa02319ff0f336c173c5616) --- src/mds/MDCache.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 9b111ac5b20..b33d498c176 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 -- 2.47.3