osd: fix compile issues

diff --git a/src/msg/Message.h b/src/msg/Message.h
index 53734d92e17899b10c972a4f6d032bab7ad8c371..1b91a08d70bbdd882aaecb779c12ac8135ffd8be 100644 (file)
--- a/src/msg/Message.h
+++ b/src/msg/Message.h
@@ -129,7 +129,7 @@ using std::list;
 
 #include "include/types.h"
 #include "include/buffer.h"
-#include "common/Throttler.h"
+#include "common/Throttle.h"
 #include "msg_types.h"
 
 #include "common/debug.h"

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index b38a85d411a73671bd77b1d045b4bebd360bfb31..924c2be8dc963fbb359d7f147c5281f8f3bfd3db 100644 (file)
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -1746,7 +1746,7 @@ Message *SimpleMessenger::Pipe::read_message()
   uint64_t message_size = header.front_len  + header.middle_len
     + header.data_len;
   messenger->message_throttler.get(message_size);
-  if (policy->throttler) throttler->get(message_size);
+  if (policy.throttler) policy.throttler->get(message_size);
 
   // read front
   bufferlist front;

diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
index 91cae9b4601695884f629c87b79ec61c59dcf0e3..b02232e0f7c097d53588790a2ced67ab236e4e6d 100644 (file)
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -58,9 +58,6 @@ public:
     bool server;
     Throttle *throttler;
 
-    Policy(bool l=false, bool s=false) :
-      lossy(l), server(s), throttler(NULL) {}
-
     Policy(bool l=false, bool s=false, Throttle *t=NULL) :
       lossy(l), server(s), throttler(t) {}