From: Kefu Chai <kchai@redhat.com>
Date: Fri, 23 Jun 2017 16:50:40 +0000 (+0800)
Subject: osdc/Objecter: release message if it is not handled
X-Git-Tag: v10.2.10~42^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1bd4df1d7f16b6cca02abb791acc298a1e6ec592;p=ceph.git

osdc/Objecter: release message if it is not handled

Fixes: http://tracker.ceph.com/issues/19741
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 5c2774234c20d809d56d005b4db34070f3029684)

Conflicts:
   src/osdc/Objecter.h (in master, ms_fast_dispatch function declaration has an
                       "override" specifier; in jewel, this specifier is missing)
---

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index 8167306dd851..2955a071e7d8 100644
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -2057,7 +2057,9 @@ private:
     }
   }
   void ms_fast_dispatch(Message *m) {
-    ms_dispatch(m);
+    if (!ms_dispatch(m)) {
+      m->put();
+    }
   }
 
   void handle_osd_op_reply(class MOSDOpReply *m);