From: Yan, Zheng <zyan@redhat.com>
Date: Wed, 5 Apr 2017 13:29:10 +0000 (+0800)
Subject: mds: make C_MDSInternalNoop::complete() delete 'this'
X-Git-Tag: v11.2.1~34^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e72d6362c15668e2340212dcdeaa07fc94d12ba7;p=ceph.git

mds: make C_MDSInternalNoop::complete() delete 'this'

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

Conflicts:
    src/mds/MDSContext.h - omit "override" because kraken does not have
        1a91aeab987870b3ccbcf2f1e476fac8b534d449
---

diff --git a/src/mds/MDSContext.h b/src/mds/MDSContext.h
index e021906463a..94899ac1f2f 100644
--- a/src/mds/MDSContext.h
+++ b/src/mds/MDSContext.h
@@ -131,12 +131,12 @@ public:
 /**
  * No-op for callers expecting MDSInternalContextBase
  */
-class C_MDSInternalNoop : public MDSInternalContextBase
+class C_MDSInternalNoop final : public MDSInternalContextBase
 {
   virtual MDSRank* get_mds() {ceph_abort();}
 public:
   void finish(int r) {}
-  void complete(int r) {}
+  void complete(int r) { delete this; }
 };