From owner-svn-src-head@FreeBSD.ORG  Sun Sep 22 14:09:08 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 ESMTP id 0FF5E312;
 Sun, 22 Sep 2013 14:09:08 +0000 (UTC)
 (envelope-from davide@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id EFFAF214D;
 Sun, 22 Sep 2013 14:09:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8ME97vj051962;
 Sun, 22 Sep 2013 14:09:07 GMT (envelope-from davide@svn.freebsd.org)
Received: (from davide@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8ME97Gr051958;
 Sun, 22 Sep 2013 14:09:07 GMT (envelope-from davide@svn.freebsd.org)
Message-Id: <201309221409.r8ME97Gr051958@svn.freebsd.org>
From: Davide Italiano <davide@FreeBSD.org>
Date: Sun, 22 Sep 2013 14:09:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255788 - head/sys/kern
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, 22 Sep 2013 14:09:08 -0000

Author: davide
Date: Sun Sep 22 14:09:07 2013
New Revision: 255788
URL: http://svnweb.freebsd.org/changeset/base/255788

Log:
  Consistently use the same value to indicate exclusively-held and
  shared-held locks for all the primitives in lc_lock/lc_unlock routines.
  This fixes the problems introduced in r255747, which indeed introduced an
  inversion in the logic.
  
  Reported by:	many
  Tested by:	bdrewery, pho, lme, Adam McDougall, O. Hartmann
  Approved by:	re (glebius)

Modified:
  head/sys/kern/kern_rwlock.c
  head/sys/kern/kern_sx.c

Modified: head/sys/kern/kern_rwlock.c
==============================================================================
--- head/sys/kern/kern_rwlock.c	Sun Sep 22 13:54:08 2013	(r255787)
+++ head/sys/kern/kern_rwlock.c	Sun Sep 22 14:09:07 2013	(r255788)
@@ -147,9 +147,9 @@ lock_rw(struct lock_object *lock, uintpt
 
 	rw = (struct rwlock *)lock;
 	if (how)
-		rw_wlock(rw);
-	else
 		rw_rlock(rw);
+	else
+		rw_wlock(rw);
 }
 
 uintptr_t
@@ -161,10 +161,10 @@ unlock_rw(struct lock_object *lock)
 	rw_assert(rw, RA_LOCKED | LA_NOTRECURSED);
 	if (rw->rw_lock & RW_LOCK_READ) {
 		rw_runlock(rw);
-		return (0);
+		return (1);
 	} else {
 		rw_wunlock(rw);
-		return (1);
+		return (0);
 	}
 }
 

Modified: head/sys/kern/kern_sx.c
==============================================================================
--- head/sys/kern/kern_sx.c	Sun Sep 22 13:54:08 2013	(r255787)
+++ head/sys/kern/kern_sx.c	Sun Sep 22 14:09:07 2013	(r255788)
@@ -162,9 +162,9 @@ lock_sx(struct lock_object *lock, uintpt
 
 	sx = (struct sx *)lock;
 	if (how)
-		sx_xlock(sx);
-	else
 		sx_slock(sx);
+	else
+		sx_xlock(sx);
 }
 
 uintptr_t
@@ -176,10 +176,10 @@ unlock_sx(struct lock_object *lock)
 	sx_assert(sx, SA_LOCKED | SA_NOTRECURSED);
 	if (sx_xlocked(sx)) {
 		sx_xunlock(sx);
-		return (1);
+		return (0);
 	} else {
 		sx_sunlock(sx);
-		return (0);
+		return (1);
 	}
 }