From 936bb2647a835e63e99fa2d1590ab1e14aab4712 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 31 Aug 2006 06:53:32 +0000 Subject: Updated to fedora-glibc-20060831T0640 --- nptl/pthread_rwlock_trywrlock.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'nptl/pthread_rwlock_trywrlock.c') diff --git a/nptl/pthread_rwlock_trywrlock.c b/nptl/pthread_rwlock_trywrlock.c index b754a19565..63760064c5 100644 --- a/nptl/pthread_rwlock_trywrlock.c +++ b/nptl/pthread_rwlock_trywrlock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2002. @@ -30,7 +30,10 @@ __pthread_rwlock_trywrlock (rwlock) lll_mutex_lock (rwlock->__data.__lock); - if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0) + if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0 + /* Respect the preference. */ + && (rwlock->__data.__flags != 0 + || rwlock->__data.__nr_readers_queued == 0)) { rwlock->__data.__writer = THREAD_GETMEM (THREAD_SELF, tid); result = 0; -- cgit v1.2.3