From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2556 invoked by alias); 16 Mar 2009 22:03:33 -0000 Received: (qmail 2548 invoked by alias); 16 Mar 2009 22:03:33 -0000 X-SWARE-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_43,SPF_HELO_PASS X-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_43,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: dlm: master - dlm_controld: fix lockfile To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: dlm.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: cfd58b24b8bb17087e19a73139cf966135e78bec X-Git-Newrev: 727070b8e1053d89abac06bcd53f0b866ab5be85 From: David Teigland Message-Id: <20090316220313.F07DD1201FC@lists.fedorahosted.org> Date: Mon, 16 Mar 2009 22:03:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q1/txt/msg00800.txt.bz2 Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=727070b8e1053d89abac06bcd53f0b866ab5be85 Commit: 727070b8e1053d89abac06bcd53f0b866ab5be85 Parent: cfd58b24b8bb17087e19a73139cf966135e78bec Author: David Teigland AuthorDate: Mon Mar 16 16:59:21 2009 -0500 Committer: David Teigland 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 --- 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);