From owner-svn-src-all@FreeBSD.ORG  Mon Sep  7 08:41:14 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E3086106566C;
	Mon,  7 Sep 2009 08:41:14 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D200F8FC14;
	Mon,  7 Sep 2009 08:41:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n878fEHu008348;
	Mon, 7 Sep 2009 08:41:14 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n878fE6M008345;
	Mon, 7 Sep 2009 08:41:14 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <200909070841.n878fE6M008345@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Mon, 7 Sep 2009 08:41:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196913 - stable/7/lib/libthr/thread
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Sep 2009 08:41:15 -0000

Author: attilio
Date: Mon Sep  7 08:41:14 2009
New Revision: 196913
URL: http://svn.freebsd.org/changeset/base/196913

Log:
  MFC r195403:
  Fix a bug in read lock acquisition for rwlocks by bumping rdlock_count
  when a successfull rwlock_rdlock_common() take place.

Modified:
  stable/7/lib/libthr/thread/thr_rtld.c
  stable/7/lib/libthr/thread/thr_rwlock.c

Modified: stable/7/lib/libthr/thread/thr_rtld.c
==============================================================================
--- stable/7/lib/libthr/thread/thr_rtld.c	Mon Sep  7 08:37:25 2009	(r196912)
+++ stable/7/lib/libthr/thread/thr_rtld.c	Mon Sep  7 08:41:14 2009	(r196913)
@@ -116,6 +116,7 @@ _thr_rtld_rlock_acquire(void *lock)
 	THR_CRITICAL_ENTER(curthread);
 	while (_thr_rwlock_rdlock(&l->lock, 0, NULL) != 0)
 		;
+	curthread->rdlock_count++;
 	RESTORE_ERRNO();
 }
 
@@ -150,6 +151,7 @@ _thr_rtld_lock_release(void *lock)
 	
 	state = l->lock.rw_state;
 	if (_thr_rwlock_unlock(&l->lock) == 0) {
+		curthread->rdlock_count--;
 		if ((state & URWLOCK_WRITE_OWNER) == 0) {
 			THR_CRITICAL_LEAVE(curthread);
 		} else {

Modified: stable/7/lib/libthr/thread/thr_rwlock.c
==============================================================================
--- stable/7/lib/libthr/thread/thr_rwlock.c	Mon Sep  7 08:37:25 2009	(r196912)
+++ stable/7/lib/libthr/thread/thr_rwlock.c	Mon Sep  7 08:41:14 2009	(r196913)
@@ -177,10 +177,11 @@ rwlock_rdlock_common(pthread_rwlock_t *r
 		/* if interrupted, try to lock it in userland again. */
 		if (_thr_rwlock_tryrdlock(&prwlock->lock, flags) == 0) {
 			ret = 0;
-			curthread->rdlock_count++;
 			break;
 		}
 	}
+	if (ret == 0)
+		curthread->rdlock_count++;
 	return (ret);
 }