From owner-p4-projects@FreeBSD.ORG  Sat Aug  5 08:41:50 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DE9B316A4E1; Sat,  5 Aug 2006 08:41:49 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B962816A4DD
	for <perforce@FreeBSD.org>; Sat,  5 Aug 2006 08:41:49 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7BFEE43D46
	for <perforce@FreeBSD.org>; Sat,  5 Aug 2006 08:41:49 +0000 (GMT)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k758fntX032155
	for <perforce@FreeBSD.org>; Sat, 5 Aug 2006 08:41:49 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k758fnOK032152
	for perforce@freebsd.org; Sat, 5 Aug 2006 08:41:49 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Sat, 5 Aug 2006 08:41:49 GMT
Message-Id: <200608050841.k758fnOK032152@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rdivacky@FreeBSD.org using -f
From: Roman Divacky <rdivacky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 103233 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Aug 2006 08:41:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=103233

Change 103233 by rdivacky@rdivacky_witten on 2006/08/05 08:41:12

	Remove the atomic_* handling of refcount and extend the FUTEX_LOCK() coverage in futex_put.
	
	Pointed out by: jhb

Affected files ...

.. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#16 edit

Differences ...

==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#16 (text+ko) ====

@@ -274,7 +274,7 @@
 	FUTEX_LOCK;
 	LIST_FOREACH(f, &futex_list, f_list) {
 		if (f->f_uaddr == uaddr) {
-			atomic_add_int(&f->f_refcount, 1);
+			f->f_refcount++;
 			FUTEX_UNLOCK;
 			return f;
 		}
@@ -297,12 +297,13 @@
 futex_put(f)
 	struct futex *f;
 {
-	if (atomic_fetchadd_int(&f->f_refcount, -1) == 1) {
-		FUTEX_LOCK;
+   	FUTEX_LOCK;
+   	f->f_refcount--;
+	if (f->f_refcount == 0) {
 		LIST_REMOVE(f, f_list);
-		FUTEX_UNLOCK;
 		free(f, M_LINUX);
 	}
+	FUTEX_UNLOCK;
 
 	return;
 }