]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: fix #include for getcwd(), simplify
authorSage Weil <sage@inktank.com>
Wed, 24 Oct 2012 16:38:58 +0000 (09:38 -0700)
committerSage Weil <sage@inktank.com>
Wed, 24 Oct 2012 16:38:58 +0000 (09:38 -0700)
Always use getcwd().. it's more portable.

Signed-off-by: Sage Weil <sage@inktank.com>
src/mds/MDS.cc

index df9002e8d59575b100afafc33d48c85a658e8d3f..a18e3f6e903705b1b364eaedf4197605abf367f8 100644 (file)
@@ -12,6 +12,8 @@
  * 
  */
 
+#include <unistd.h>
+
 #include "global/signal_handler.h"
 
 #include "include/types.h"
@@ -1580,19 +1582,9 @@ void MDS::respawn()
   }
   new_argv[orig_argc] = NULL;
 
-#if defined(__linux__)
-  char *dir = get_current_dir_name();
-  dout(1) << " cwd " << dir << dendl;
-  free(dir);
-#else
-  {
-#include <sys/param.h>
-    char buf[PATH_MAX];
-    
-    getcwd(buf, sizeof(buf));
-    dout(1) << " cwd " << buf << dendl;
-  }
-#endif
+  char buf[PATH_MAX];
+  getcwd(buf, sizeof(buf));
+  dout(1) << " cwd " << buf << dendl;
 
   unblock_all_signals(NULL);
   execv(orig_argv[0], new_argv);