msg: Remove dead code MSG_OSD_IN/OUT

diff --git a/src/Makefile.am b/src/Makefile.am
index e8aac538cf4af49e1ac52dfa1a0a0134c8bc1d6d..cf464b29c05e7bbfae08901d5a92076bebcedb48 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -641,11 +641,9 @@ noinst_HEADERS = \
         messages/MOSDAlive.h\
         messages/MOSDBoot.h\
         messages/MOSDFailure.h\
-        messages/MOSDIn.h\
         messages/MOSDMap.h\
         messages/MOSDOp.h\
         messages/MOSDOpReply.h\
-        messages/MOSDOut.h\
         messages/MOSDPGCreate.h\
         messages/MOSDPGInfo.h\
         messages/MOSDPGLog.h\

diff --git a/src/messages/MOSDIn.h b/src/messages/MOSDIn.h
deleted file mode 100644 (file)
index f6782ca..0000000
--- a/src/messages/MOSDIn.h
+++ /dev/null
@@ -1,44 +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>
- *
- * 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 __MOSDIN_H
-#define __MOSDIN_H
-
-#include "messages/PaxosServiceMessage.h"
-
-
-class MOSDIn : public PaxosServiceMessage {
- public:
-  epoch_t map_epoch;
-
-  MOSDIn(epoch_t e) : PaxosServiceMessage(MSG_OSD_IN, e), map_epoch(e) {
-  }
-  MOSDIn() {}
-
-  void encode_payload() {
-    paxos_encode();
-    ::encode(map_epoch, payload);
-  }
-  void decode_payload() {
-    bufferlist::iterator p = payload.begin();
-    paxos_decode(p);
-    ::decode(map_epoch, p);
-  }
-
-  const char *get_type_name() { return "oin"; }
-};
-
-#endif

diff --git a/src/messages/MOSDOut.h b/src/messages/MOSDOut.h
deleted file mode 100644 (file)
index c356477..0000000
--- a/src/messages/MOSDOut.h
+++ /dev/null
@@ -1,44 +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>
- *
- * 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 __MOSDOUT_H
-#define __MOSDOUT_H
-
-#include "messages/PaxosServiceMessage.h"
-
-
-class MOSDOut : public PaxosServiceMessage {
- public:
-  epoch_t map_epoch;
-
-  MOSDOut(epoch_t e) : PaxosServiceMessage(MSG_OSD_OUT, e), map_epoch(e) {
-  }
-  MOSDOut() {}
-
-  void encode_payload() {
-    paxos_encode();
-    ::encode(map_epoch, payload);
-  }
-  void decode_payload() {
-    bufferlist::iterator p = payload.begin();
-    paxos_decode(p);
-    ::decode(map_epoch, p);
-  }
-
-  const char *get_type_name() { return "oout"; }
-};
-
-#endif

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 2c216ce51dd6128b042475d565134f130c6cfe9d..0b1cba1b0899c30c82c827e19342b76daa458f47 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -622,8 +622,6 @@ do { \
       // OSDs
     case MSG_OSD_FAILURE:
     case MSG_OSD_BOOT:
-    case MSG_OSD_IN:
-    case MSG_OSD_OUT:
     case MSG_OSD_ALIVE:
     case MSG_OSD_PGTEMP:
       ALLOW_MESSAGES_FROM(CEPH_ENTITY_TYPE_OSD);

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 8876c23d3c3869f3e24928a0dcda6bfda34429e9..558c318a219e8da93a825ac980372cc3cb49bbbd 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -209,10 +209,6 @@ bool OSDMonitor::preprocess_query(PaxosServiceMessage *m)
     return preprocess_alive((MOSDAlive*)m);
   case MSG_OSD_PGTEMP:
     return preprocess_pgtemp((MOSDPGTemp*)m);
-    /*
-  case MSG_OSD_OUT:
-    return preprocess_out((MOSDOut*)m);
-    */
 
   case MSG_POOLOP:
     return preprocess_pool_op((MPoolOp*)m);
@@ -245,10 +241,6 @@ bool OSDMonitor::prepare_update(PaxosServiceMessage *m)
   case MSG_MON_COMMAND:
     return prepare_command((MMonCommand*)m);
     
-    /*
-  case MSG_OSD_OUT:
-    return prepare_out((MOSDOut*)m);
-    */
   case MSG_POOLOP:
     return prepare_pool_op((MPoolOp*)m);
 

diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index da7012cd4b3a4b917e9c1c6ff17716fc60c88c7c..246822508f9721ae49f6d7408e62abfd0ad263eb 100644 (file)
--- a/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@ -142,9 +142,6 @@ private:
     }
   };
 
-  bool preprocess_out(class MOSDOut *m);
-  bool prepare_out(class MOSDOut *m);
-
   bool preprocess_remove_snaps(class MRemoveSnaps *m);
   bool prepare_remove_snaps(class MRemoveSnaps *m);
 

diff --git a/src/msg/Message.cc b/src/msg/Message.cc
index 969ee89ef11002b7ff787df0a3ad29c821121571..f5f9797e6b27ba32d475af3858f209555d7a4392 100644 (file)
--- a/src/msg/Message.cc
+++ b/src/msg/Message.cc
@@ -41,8 +41,6 @@ using namespace std;
 #include "messages/MOSDBoot.h"
 #include "messages/MOSDAlive.h"
 #include "messages/MOSDPGTemp.h"
-#include "messages/MOSDIn.h"
-#include "messages/MOSDOut.h"
 #include "messages/MOSDFailure.h"
 #include "messages/MOSDPing.h"
 #include "messages/MOSDOp.h"
@@ -263,12 +261,6 @@ Message *decode_message(ceph_msg_header& header, ceph_msg_footer& footer,
   case MSG_OSD_PGTEMP:
     m = new MOSDPGTemp;
     break;
-  case MSG_OSD_IN:
-    m = new MOSDIn();
-    break;
-  case MSG_OSD_OUT:
-    m = new MOSDOut();
-    break;
   case MSG_OSD_FAILURE:
     m = new MOSDFailure();
     break;

diff --git a/src/msg/Message.h b/src/msg/Message.h
index 79795067a015fc56429dce26c5da1de2cefddfa1..a9a8f2e5eaa6339ccec61ccd7125fcebf5486d4e 100644 (file)
--- a/src/msg/Message.h
+++ b/src/msg/Message.h
@@ -52,8 +52,6 @@
 #define MSG_OSD_BOOT         71
 #define MSG_OSD_FAILURE      72
 #define MSG_OSD_ALIVE        73
-#define MSG_OSD_IN           74
-#define MSG_OSD_OUT          75
 
 #define MSG_OSD_SUBOP        76
 #define MSG_OSD_SUBOPREPLY   77

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 58343e3f13a6ad31ecb97d1c6945c13558b4ab64..591bb1a040c6feb0da12d791334f770d6aa19c50 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -48,8 +48,6 @@
 #include "messages/MOSDSubOp.h"
 #include "messages/MOSDSubOpReply.h"
 #include "messages/MOSDBoot.h"
-#include "messages/MOSDIn.h"
-#include "messages/MOSDOut.h"
 #include "messages/MOSDPGTemp.h"
 
 #include "messages/MOSDMap.h"