From 1076d738148ddba93d1d6a05a2636e470f85f0a1 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Mon, 10 Mar 2008 08:54:57 -0700
Subject: [PATCH] make cmonctl and cfuse use MonClient too

---
 src/cfuse.cc   | 9 ++++++---
 src/cmonctl.cc | 8 +++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/cfuse.cc b/src/cfuse.cc
index fed50ca001134..bcd6194d7d25e 100644
--- a/src/cfuse.cc
+++ b/src/cfuse.cc
@@ -25,6 +25,8 @@ using namespace std;
 
 #include "msg/SimpleMessenger.h"
 
+#include "mon/MonClient.h"
+
 #include "common/Timer.h"
        
 #ifndef DARWIN
@@ -50,10 +52,11 @@ int main(int argc, const char **argv, const char *envp[]) {
 
   if (g_conf.clock_tare) g_clock.tare();
 
-  // load monmap
+  // get monmap
   MonMap monmap;
-  int r = monmap.read(".ceph_monmap");
-  assert(r >= 0);
+  MonClient mc;
+  if (mc.get_monmap(&monmap) < 0)
+    return -1;
 
   // start up network
   rank.bind();
diff --git a/src/cmonctl.cc b/src/cmonctl.cc
index 2f4ecc554f801..42d225b4b696c 100644
--- a/src/cmonctl.cc
+++ b/src/cmonctl.cc
@@ -20,6 +20,7 @@ using namespace std;
 #include "config.h"
 
 #include "mon/MonMap.h"
+#include "mon/MonClient.h"
 #include "msg/SimpleMessenger.h"
 #include "messages/MMonCommand.h"
 #include "messages/MMonCommandAck.h"
@@ -98,10 +99,11 @@ int main(int argc, const char **argv, const char *envp[]) {
       nargs.push_back(args[i]);
   }
 
-  // load monmap
+  // get monmap
   MonMap monmap;
-  int r = monmap.read(".ceph_monmap");
-  assert(r >= 0);
+  MonClient mc;
+  if (mc.get_monmap(&monmap) < 0)
+    return -1;
   
   // start up network
   rank.bind();
-- 
2.39.5