From: Greg Farnum <gregf@hq.newdream.net>
Date: Fri, 16 Apr 2010 19:28:14 +0000 (-0700)
Subject: mds: Fix some compile-time issues.
X-Git-Tag: v0.22~625^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=751a4056c7766fa774074d33d92dba4c30166807;p=ceph.git

mds: Fix some compile-time issues.
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 8d3391d30db3..22a08a01760f 100644
--- 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 5dfde320c027..7deac9382d62 100644
--- 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 26ed4da9fb94..8264790e5878 100644
--- 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();