From owner-svn-src-head@FreeBSD.ORG  Mon Oct 18 05:15:26 2010
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E75D0106564A;
	Mon, 18 Oct 2010 05:15:26 +0000 (UTC)
	(envelope-from davidxu@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D5E028FC12;
	Mon, 18 Oct 2010 05:15:26 +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 o9I5FQ75080833;
	Mon, 18 Oct 2010 05:15:26 GMT (envelope-from davidxu@svn.freebsd.org)
Received: (from davidxu@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9I5FQkV080831;
	Mon, 18 Oct 2010 05:15:26 GMT (envelope-from davidxu@svn.freebsd.org)
Message-Id: <201010180515.o9I5FQkV080831@svn.freebsd.org>
From: David Xu <davidxu@FreeBSD.org>
Date: Mon, 18 Oct 2010 05:15:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214008 - head/lib/libthr/thread
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Mon, 18 Oct 2010 05:15:27 -0000

Author: davidxu
Date: Mon Oct 18 05:15:26 2010
New Revision: 214008
URL: http://svn.freebsd.org/changeset/base/214008

Log:
  s/||/&&

Modified:
  head/lib/libthr/thread/thr_rwlockattr.c

Modified: head/lib/libthr/thread/thr_rwlockattr.c
==============================================================================
--- head/lib/libthr/thread/thr_rwlockattr.c	Mon Oct 18 05:09:22 2010	(r214007)
+++ head/lib/libthr/thread/thr_rwlockattr.c	Mon Oct 18 05:15:26 2010	(r214008)
@@ -103,8 +103,8 @@ _pthread_rwlockattr_setpshared(pthread_r
 int
 _pthread_rwlockattr_setkind_np(pthread_rwlockattr_t *attr, int kind)
 {
-	if (kind != PTHREAD_RWLOCK_PREFER_READER_NP ||
-	    kind != PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP ||
+	if (kind != PTHREAD_RWLOCK_PREFER_READER_NP &&
+	    kind != PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP &&
 	    kind != PTHREAD_RWLOCK_PREFER_WRITER_NP) {
 		return (EINVAL);
 	}