gfs2-utils: master - gfs_controld: fix lockfile

gfs2-utils: master - gfs_controld: fix lockfile

[David Teigland]

Gitweb:        http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=b4e3264730646b30e72e3298127cbe2eb987007d
Commit:        b4e3264730646b30e72e3298127cbe2eb987007d
Parent:        1d2727647dda5479cc780577682d83f6ca57133c
Author:        David Teigland <teigland@redhat.com>
AuthorDate:    Mon Mar 16 17:00:32 2009 -0500
Committer:     David Teigland <teigland@redhat.com>
CommitterDate: Mon Mar 16 17:00:32 2009 -0500

gfs_controld: fix lockfile

gfs_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/gfs_controld/main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/group/gfs_controld/main.c b/group/gfs_controld/main.c
index 3383453..f986fd1 100644
--- a/group/gfs_controld/main.c
+++ b/group/gfs_controld/main.c
@@ -1309,7 +1309,6 @@ int main(int argc, char **argv)
 	INIT_LIST_HEAD(&withdrawn_mounts);
 
 	read_arguments(argc, argv);
-	lockfile();
 
 	if (!daemon_debug_opt) {
 		if (daemon(0, 0) < 0) {
@@ -1317,6 +1316,7 @@ int main(int argc, char **argv)
 			exit(EXIT_FAILURE);
 		}
 	}
+	lockfile();
 	init_logging();
 	log_level(LOG_INFO, "gfs_controld %s", RELEASE_VERSION);
 	signal(SIGTERM, sigterm_handler);