diff options
author | Jakub Jelinek <jakub@redhat.com> | 2006-08-31 06:53:32 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2006-08-31 06:53:32 +0000 |
commit | 936bb2647a835e63e99fa2d1590ab1e14aab4712 (patch) | |
tree | e0fcf856a8a2051f8878dd4c8eca215bc549de13 /nptl/pthread_rwlock_trywrlock.c | |
parent | 2455d11258712bbab8a52c7951301924a483a295 (diff) |
Updated to fedora-glibc-20060831T0640cvs/fedora-glibc-2_4_90-27
Diffstat (limited to 'nptl/pthread_rwlock_trywrlock.c')
-rw-r--r-- | nptl/pthread_rwlock_trywrlock.c | 7 |
1 files changed, 5 insertions, 2 deletions
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 <drepper@redhat.com>, 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; |