From ca342b877130c0576917de855f60fbd6514106f1 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 13 Nov 2009 11:10:36 -0800
Subject: [PATCH] mkmonfs: cleanup monmap fn arg

---
 src/mkmonfs.cc | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/mkmonfs.cc b/src/mkmonfs.cc
index 604e03007ed78..fd2cff9f5f8db 100644
--- a/src/mkmonfs.cc
+++ b/src/mkmonfs.cc
@@ -38,10 +38,7 @@ int main(int argc, const char **argv)
   common_init(args, "mon", false, false);
 
   bool clobber = false;
-  const char *fsdir = g_conf.mon_data;
-
   int whoami = -1;
-  const char *monmapfn = g_conf.monmap;
   const char *osdmapfn = 0;
 
   FOR_EACH_ARG(args) {
@@ -55,7 +52,7 @@ int main(int argc, const char **argv)
       usage();
     }
   }
-  if (!g_conf.mon_data || !monmapfn || whoami < 0)
+  if (!g_conf.mon_data || !g_conf.monmap || whoami < 0)
     usage();
 
   if (!clobber) {
@@ -69,7 +66,7 @@ int main(int argc, const char **argv)
 
   // load monmap
   bufferlist monmapbl, osdmapbl;
-  int err = monmapbl.read_file(monmapfn);
+  int err = monmapbl.read_file(g_conf.monmap);
   if (err < 0)
     exit(1);
   MonMap monmap;
-- 
2.39.5