From owner-svn-src-head@FreeBSD.ORG  Sun Feb 17 02:52:43 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 066F6560;
 Sun, 17 Feb 2013 02:52:43 +0000 (UTC)
 (envelope-from davidxu@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E7A336A3;
 Sun, 17 Feb 2013 02:52:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1H2qgQt043730;
 Sun, 17 Feb 2013 02:52:42 GMT (envelope-from davidxu@svn.freebsd.org)
Received: (from davidxu@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1H2qgau043728;
 Sun, 17 Feb 2013 02:52:42 GMT (envelope-from davidxu@svn.freebsd.org)
Message-Id: <201302170252.r1H2qgau043728@svn.freebsd.org>
From: David Xu <davidxu@FreeBSD.org>
Date: Sun, 17 Feb 2013 02:52:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r246894 - head/lib/libc/gen
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Feb 2013 02:52:43 -0000

Author: davidxu
Date: Sun Feb 17 02:52:42 2013
New Revision: 246894
URL: http://svnweb.freebsd.org/changeset/base/246894

Log:
  Make more code be protected by internal mutex, and now it is fork-safe, in
  error case, the file exclusive lock is now released as soon as possible,
  in previous code, child process can still hold the exclusive lock.

Modified:
  head/lib/libc/gen/sem_new.c

Modified: head/lib/libc/gen/sem_new.c
==============================================================================
--- head/lib/libc/gen/sem_new.c	Sun Feb 17 02:15:19 2013	(r246893)
+++ head/lib/libc/gen/sem_new.c	Sun Feb 17 02:52:42 2013	(r246894)
@@ -229,18 +229,18 @@ _sem_open(const char *name, int flags, .
 	ni->open_count = 1;
 	ni->sem = sem;
 	LIST_INSERT_HEAD(&sem_list, ni, next);
-	_pthread_mutex_unlock(&sem_llock);
 	_close(fd);
+	_pthread_mutex_unlock(&sem_llock);
 	return (sem);
 
 error:
 	errsave = errno;
-	_pthread_mutex_unlock(&sem_llock);
 	if (fd != -1)
 		_close(fd);
 	if (sem != NULL)
 		munmap(sem, sizeof(sem_t));
 	free(ni);
+	_pthread_mutex_unlock(&sem_llock);
 	errno = errsave;
 	return (SEM_FAILED);
 }