From 18c1386f1d47d9dc7b190218b58e5f4b92c06da7 Mon Sep 17 00:00:00 2001
From: Jos Collin <jcollin@redhat.com>
Date: Fri, 10 Jul 2020 13:08:43 +0530
Subject: [PATCH] messages: inherit MMDSPing and MMDSMetrics from MMDSOp

The inter-MDS messages MMDSPing and MMDSMetrics should inherit from
MMDSOp before the MDS dispatch the message.

Fixes: https://tracker.ceph.com/issues/46426
Signed-off-by: Jos Collin <jcollin@redhat.com>
---
 src/messages/MMDSMetrics.h | 8 ++++----
 src/messages/MMDSPing.h    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/messages/MMDSMetrics.h b/src/messages/MMDSMetrics.h
index 020cfabfb468f..677fedad6b4f3 100644
--- a/src/messages/MMDSMetrics.h
+++ b/src/messages/MMDSMetrics.h
@@ -4,10 +4,10 @@
 #ifndef CEPH_MDS_METRICS_H
 #define CEPH_MDS_METRICS_H
 
-#include "msg/Message.h"
+#include "messages/MMDSOp.h"
 #include "mds/MDSPerfMetricTypes.h"
 
-class MMDSMetrics : public SafeMessage {
+class MMDSMetrics : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
@@ -16,10 +16,10 @@ public:
   metrics_message_t metrics_message;
 
 protected:
-  MMDSMetrics() : SafeMessage(MSG_MDS_METRICS, HEAD_VERSION, COMPAT_VERSION) {
+  MMDSMetrics() : MMDSOp(MSG_MDS_METRICS, HEAD_VERSION, COMPAT_VERSION) {
   }
   MMDSMetrics(metrics_message_t metrics_message)
-    : SafeMessage(MSG_MDS_METRICS, HEAD_VERSION, COMPAT_VERSION),
+    : MMDSOp(MSG_MDS_METRICS, HEAD_VERSION, COMPAT_VERSION),
       metrics_message(metrics_message) {
   }
   ~MMDSMetrics() { }
diff --git a/src/messages/MMDSPing.h b/src/messages/MMDSPing.h
index 8746550cf5463..80dc859ede966 100644
--- a/src/messages/MMDSPing.h
+++ b/src/messages/MMDSPing.h
@@ -5,9 +5,9 @@
 #define CEPH_MESSAGES_MMDSPING_H
 
 #include "include/types.h"
-#include "msg/Message.h"
+#include "messages/MMDSOp.h"
 
-class MMDSPing : public SafeMessage {
+class MMDSPing : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
@@ -15,10 +15,10 @@ public:
   version_t seq;
 
 protected:
-  MMDSPing() : SafeMessage(MSG_MDS_PING, HEAD_VERSION, COMPAT_VERSION) {
+  MMDSPing() : MMDSOp(MSG_MDS_PING, HEAD_VERSION, COMPAT_VERSION) {
   }
   MMDSPing(version_t seq)
-    : SafeMessage(MSG_MDS_PING, HEAD_VERSION, COMPAT_VERSION), seq(seq) {
+    : MMDSOp(MSG_MDS_PING, HEAD_VERSION, COMPAT_VERSION), seq(seq) {
   }
   ~MMDSPing() { }
 
-- 
2.39.5