From 5c00928c1b07f7b0f4ab1866872d1dc1b50a157b Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Mon, 15 Apr 2019 11:15:09 +0800
Subject: [PATCH] messages: remove MNop

MNop was introduced along with xio messenger. since we've dropped
xiomessenger in #27021, there is no need to keep MNop around anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 src/messages/MNop.h             | 57 ---------------------------------
 src/msg/MessageRef.h            |  1 -
 src/tools/ceph-dencoder/types.h |  3 --
 3 files changed, 61 deletions(-)
 delete mode 100644 src/messages/MNop.h

diff --git a/src/messages/MNop.h b/src/messages/MNop.h
deleted file mode 100644
index 452f509c6c5..00000000000
--- a/src/messages/MNop.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
-/*
- * Ceph - scalable distributed file system
- *
- * Copyright (C) 2004-2006 Sage Weil <sage@newdream.net>
- * Portions Copyright (C) 2014 CohortFS, LLC
- *
- * This is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software
- * Foundation.  See file COPYING.
- *
- */
-
-#ifndef CEPH_MSG_NOP_H
-#define CEPH_MSG_NOP_H
-
-#include "msg/Message.h"
-#include "msg/msg_types.h"
-
-/*
- * A message with no (remote) effect.
- */
-class MNop : public MessageInstance<MNop> {
-public:
-  friend factory;
-
-  static constexpr int HEAD_VERSION = 1;
-  static constexpr int COMPAT_VERSION = 1;
-
-  __u32 tag; // ignored tag value
-
-  MNop()
-    : MessageInstance(MSG_NOP, HEAD_VERSION, COMPAT_VERSION)
-    {}
-
-  ~MNop() {}
-
-  void encode_payload(uint64_t _features) {
-    using ceph::encode;
-    encode(tag, payload);
-  }
-
-  void decode_payload() {
-    auto p = payload.cbegin();
-    decode(tag, p);
-  }
-
-  std::string_view get_type_name() const { return "MNop"; }
-
-  void print(ostream& out) const {
-    out << get_type_name() << " ";
-  }
-}; /* MNop */
-
-#endif /* CEPH_MSG_NOP_H */
diff --git a/src/msg/MessageRef.h b/src/msg/MessageRef.h
index b6498904a0c..5eb3655cb84 100644
--- a/src/msg/MessageRef.h
+++ b/src/msg/MessageRef.h
@@ -119,7 +119,6 @@ class MMonScrub;
 class MMonSubscribeAck;
 class MMonSubscribe;
 class MMonSync;
-class MNop;
 class MOSDAlive;
 class MOSDBackoff;
 class MOSDBeacon;
diff --git a/src/tools/ceph-dencoder/types.h b/src/tools/ceph-dencoder/types.h
index 54250c417cc..4f3206d4539 100644
--- a/src/tools/ceph-dencoder/types.h
+++ b/src/tools/ceph-dencoder/types.h
@@ -762,9 +762,6 @@ MESSAGE(MMonSubscribe)
 #include "messages/MMonSubscribeAck.h"
 MESSAGE(MMonSubscribeAck)
 
-#include "messages/MNop.h"
-MESSAGE(MNop)
-
 #include "messages/MOSDAlive.h"
 MESSAGE(MOSDAlive)
 
-- 
2.39.5