From owner-svn-src-stable@FreeBSD.ORG  Mon May  5 16:52:38 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EAAA1514;
 Mon,  5 May 2014 16:52:38 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D75ED38E;
 Mon,  5 May 2014 16:52:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s45Gqc12091675;
 Mon, 5 May 2014 16:52:38 GMT (envelope-from ghelmer@svn.freebsd.org)
Received: (from ghelmer@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s45Gqcdl091674;
 Mon, 5 May 2014 16:52:38 GMT (envelope-from ghelmer@svn.freebsd.org)
Message-Id: <201405051652.s45Gqcdl091674@svn.freebsd.org>
From: Guy Helmer <ghelmer@FreeBSD.org>
Date: Mon, 5 May 2014 16:52:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r265368 - stable/10/libexec/atrun
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 May 2014 16:52:39 -0000

Author: ghelmer
Date: Mon May  5 16:52:38 2014
New Revision: 265368
URL: http://svnweb.freebsd.org/changeset/base/265368

Log:
  MFC r264617:
  
  Fix releasing the lock in the parent atrun process after the queue
  directory has been processed. Otherwise, a long-running child process
  caused other atrun invocations to stall unnecessarily.
  
  Submitted by:	J.R. Oldroyd  jr at opal.com

Modified:
  stable/10/libexec/atrun/atrun.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/libexec/atrun/atrun.c
==============================================================================
--- stable/10/libexec/atrun/atrun.c	Mon May  5 16:41:15 2014	(r265367)
+++ stable/10/libexec/atrun/atrun.c	Mon May  5 16:52:38 2014	(r265368)
@@ -567,6 +567,12 @@ main(int argc, char *argv[])
     if (run_batch && (gloadavg() < load_avg))
 	run_file(batch_name, batch_uid, batch_gid);
 
+    if (flock(dirfd(spool), LOCK_UN) == -1)
+	perr("cannot unlock %s", ATJOB_DIR);
+
+    if (closedir(spool) == -1)
+	perr("cannot closedir %s", ATJOB_DIR);
+
     closelog();
     exit(EXIT_SUCCESS);
 }