mds: Fix some compile-time issues.

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 8d3391d30db3eb41ed889efe8cf04ea97ec8db73..22a08a01760fc78a3cb33ea528376bc2b0712330 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -3233,7 +3233,7 @@ void MDCache::handle_cache_rejoin_weak(MMDSCacheRejoin *weak)
     }
 
     rejoin_scour_survivor_replicas(from, ack);
-    mds->send_message(ack, get_connection());
+    mds->send_message(ack, weak->get_connection());
   } else {
     // done?
     assert(rejoin_gather.count(from));

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 5dfde320c027d7e594fd333fcf396e4af07c4c17..7deac9382d6225bb016b554b6d3c23729fa81b6b 100644 (file)
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -303,6 +303,9 @@ MDSTableServer *MDS::get_table_server(int t)
 
 
 
+void MDS::send_message(Message *m, Connection *c) { 
+  messenger->send_message(m, c);
+}
 
 
 void MDS::send_message_mds(Message *m, int mds)

diff --git a/src/mds/MDS.h b/src/mds/MDS.h
index 26ed4da9fb94f17eec5cb7dfd57dd80017635c1d..8264790e58782e919c11a14b3f6f7d11b1a2454a 100644 (file)
--- a/src/mds/MDS.h
+++ b/src/mds/MDS.h
@@ -333,10 +333,7 @@ class MDS : public Dispatcher {
 
   void send_message_client(Message *m, client_t client);
   void send_message_client(Message *m, entity_inst_t clientinst);
-
-  void send_message(Message *m, Connection *c) { 
-    messenger->send_message(m, c);
-  }
+  void send_message(Message *m, Connection *c);
 
   // start up, shutdown
   int init();