dlm: master - dlm_controld: fix lockfile

dlm: master - dlm_controld: fix lockfile

[David Teigland]

Gitweb:        http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=727070b8e1053d89abac06bcd53f0b866ab5be85
Commit:        727070b8e1053d89abac06bcd53f0b866ab5be85
Parent:        cfd58b24b8bb17087e19a73139cf966135e78bec
Author:        David Teigland <teigland@redhat.com>
AuthorDate:    Mon Mar 16 16:59:21 2009 -0500
Committer:     David Teigland <teigland@redhat.com>
CommitterDate: Mon Mar 16 16:59:21 2009 -0500

dlm_controld: fix lockfile

dlm_controld was taking a lock on its lockfile before forking, but
forking clears the locks, so it needs to happen after the fork.

Signed-off-by: David Teigland <teigland@redhat.com>
---
 group/dlm_controld/main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/group/dlm_controld/main.c b/group/dlm_controld/main.c
index 3ac56bf..9fde4f3 100644
--- a/group/dlm_controld/main.c
+++ b/group/dlm_controld/main.c
@@ -1204,7 +1204,6 @@ int main(int argc, char **argv)
 	INIT_LIST_HEAD(&fs_register_list);
 
 	read_arguments(argc, argv);
-	lockfile();
 
 	if (!daemon_debug_opt) {
 		if (daemon(0, 0) < 0) {
@@ -1212,6 +1211,7 @@ int main(int argc, char **argv)
 			exit(EXIT_FAILURE);
 		}
 	}
+	lockfile();
 	init_logging();
 	log_level(LOG_INFO, "dlm_controld %s", RELEASE_VERSION);
 	signal(SIGTERM, sigterm_handler);