From a454f2372b604b6b0c9099cf8e9d05b01cb9caaa Mon Sep 17 00:00:00 2001
From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Fri, 4 Feb 2011 10:57:56 -0800
Subject: [PATCH] msgr: remove deadcode, warnings

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
---
 src/msg/SimpleMessenger.cc | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 97e87c1167ae6..2dd82afe47988 100644
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -2407,22 +2407,9 @@ int SimpleMessenger::start(bool nodaemon)
 	      << dendl;
     }
 
-    if (1) {
-      daemon(1, 0);
-      install_standard_sighandlers();
-      write_pid_file(getpid());
-    } else {
-      pid_t pid = fork();
-      if (pid) {
-	// i am parent
-	write_pid_file(pid);
-	::close(0);
-	::close(1);
-	::close(2);
-	_exit(0);
-      }
-      install_standard_sighandlers();
-    }
+    daemon(1, 0);
+    install_standard_sighandlers();
+    write_pid_file(getpid());
  
     if (g_conf.chdir && g_conf.chdir[0]) {
       ::mkdir(g_conf.chdir, 0700);
-- 
2.39.5