]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: make C_MDSInternalNoop::complete() delete 'this' 14677/head
authorYan, Zheng <zyan@redhat.com>
Wed, 5 Apr 2017 13:29:10 +0000 (21:29 +0800)
committerNathan Cutler <ncutler@suse.com>
Thu, 20 Apr 2017 11:41:25 +0000 (13:41 +0200)
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 jewel does not have
        1a91aeab987870b3ccbcf2f1e476fac8b534d449)

src/mds/MDSContext.h

index d26d1bdb783a6ccdeead1ea497bb9ba0e02550b6..d86b732ff92fb999f7c59fb982f38cfd3bc8ab32 100644 (file)
@@ -114,12 +114,12 @@ public:
 /**
  * No-op for callers expecting MDSInternalContextBase
  */
-class C_MDSInternalNoop : public MDSInternalContextBase
+class C_MDSInternalNoop final : public MDSInternalContextBase
 {
   virtual MDSRank* get_mds() {assert(0);}
 public:
   void finish(int r) {}
-  void complete(int r) {}
+  void complete(int r) { delete this; }
 };