msg: add missing #includes for messages

And remove that unused max() macro.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/messages/MCacheExpire.h b/src/messages/MCacheExpire.h
index c88583a1952415b3c80c742a83cd89636263d5dc..3e1b0e6ab4991b3dd4a4310d25a000b76a504807 100644 (file)
--- a/src/messages/MCacheExpire.h
+++ b/src/messages/MCacheExpire.h
@@ -15,6 +15,8 @@
 #ifndef CEPH_MCACHEEXPIRE_H
 #define CEPH_MCACHEEXPIRE_H
 
+#include "mds/mdstypes.h"
+
 class MCacheExpire : public Message {
   __s32 from;
 

diff --git a/src/messages/MDiscoverReply.h b/src/messages/MDiscoverReply.h
index 0b424157a68e9b696d985a39a01245a4c040b210..7a41be1e3f65cb8d48dab49ab1ffd20e55d9b786 100644 (file)
--- a/src/messages/MDiscoverReply.h
+++ b/src/messages/MDiscoverReply.h
@@ -23,7 +23,6 @@
 #include <string>
 using namespace std;
 
-#define max(a,b)  ((a)>(b) ? (a):(b))
 
 
 /**

diff --git a/src/messages/MGenericMessage.h b/src/messages/MGenericMessage.h
index e042bef00c8b1a73b509b5b3048a4446e894419a..6f326aa8cd0e2bbeff8ddc9cad1806e2ffb4809b 100644 (file)
--- a/src/messages/MGenericMessage.h
+++ b/src/messages/MGenericMessage.h
@@ -23,7 +23,7 @@ class MGenericMessage : public Message {
   //long pcid;
 
  public:
-  MGenericMessage(int t) : Message(t) { 
+  MGenericMessage(int t=0) : Message(t) { 
     snprintf(tname, sizeof(tname), "generic%d", get_type());
   }
 

diff --git a/src/messages/MLock.h b/src/messages/MLock.h
index 0d66a001e24e224ced24856f3b65e4be64cf2d0e..66cbe212f388b7731bd38345df01e46b06113af5 100644 (file)
--- a/src/messages/MLock.h
+++ b/src/messages/MLock.h
@@ -18,6 +18,7 @@
 
 #include "msg/Message.h"
 #include "mds/locks.h"
+#include "mds/SimpleLock.h"
 
 class MLock : public Message {
   int32_t     action;  // action type

diff --git a/src/messages/MOSDPGInfo.h b/src/messages/MOSDPGInfo.h
index 19ee76673d179096c8ff37a33643ffd9310278ee..21796f4b8cb566aa93b499184bf7a5a5028cb82a 100644 (file)
--- a/src/messages/MOSDPGInfo.h
+++ b/src/messages/MOSDPGInfo.h
@@ -17,6 +17,7 @@
 #define CEPH_MOSDPGINFO_H
 
 #include "msg/Message.h"
+#include "osd/PG.h"
 
 class MOSDPGInfo : public Message {
   epoch_t epoch;