mds: adjust scan_stray_dir after fixing up MDSContext class

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 66abd9a13f670d6ea87ad23daef497d7a26e69e9)

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 6f53684db566c439229429e9490e97a86b7b8dd2..053eb209512456d77775bb7f3a4e8d859842476c 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -10320,7 +10320,7 @@ int MDCache::scan_stray_dir(dirfrag_t next, std::unique_ptr<MDCache::C_MDS_DumpS
   // only if we came from asok cmd handler
   if (cmd_ctx) {
     cmd_ctx->end_dump();
-    cmd_ctx->finish(0);
+    cmd_ctx->complete(0);
   }
   return 0;
 }

diff --git a/src/mds/MDCache.h b/src/mds/MDCache.h
index a87acb2cfaaca278d2f71ffa80665721d2f77224..38b5bdb0de151582cfc607e98f66bf426fb4035d 100644 (file)
--- a/src/mds/MDCache.h
+++ b/src/mds/MDCache.h
@@ -645,7 +645,6 @@ private:
   public:
   void finish(int r) override {
     ceph_assert(on_finish);
-    MDSContext::finish(r);
     on_finish(r);
   }
   Formatter* get_formatter() const {