diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-08-31 17:16:11 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-08-31 17:16:11 +0000 |
| commit | b80770b23f7c285fb7c04e3e86dc5f2bb2a1cf11 (patch) | |
| tree | 3b7b9b7146a0bd23b9111a84a03f7d21bf8cec27 /nptl/pthread_rwlock_trywrlock.c | |
| parent | bee2df0bb966087d7f57d935a4234ffe30c76196 (diff) | |
| download | glibc-b80770b23f7c285fb7c04e3e86dc5f2bb2a1cf11.tar.gz | |
* dlfcn/Makefile (LDLIBS-bug-atexit3-lib.so): Addcvs/fedora-glibc-20060831T1812
ld.so.
* malloc/malloc.c (_int_malloc): Use full list insert and not
shortcut which assumes the list is empty for large requests
too.
* elf/tst-addr1.c (do_test): Allow i.dli_sname "_IO_printf".
Diffstat (limited to 'nptl/pthread_rwlock_trywrlock.c')
| -rw-r--r-- | nptl/pthread_rwlock_trywrlock.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/nptl/pthread_rwlock_trywrlock.c b/nptl/pthread_rwlock_trywrlock.c index 63760064c5..b754a19565 100644 --- a/nptl/pthread_rwlock_trywrlock.c +++ b/nptl/pthread_rwlock_trywrlock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -30,10 +30,7 @@ __pthread_rwlock_trywrlock (rwlock) lll_mutex_lock (rwlock->__data.__lock); - if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0 - /* Respect the preference. */ - && (rwlock->__data.__flags != 0 - || rwlock->__data.__nr_readers_queued == 0)) + if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0) { rwlock->__data.__writer = THREAD_GETMEM (THREAD_SELF, tid); result = 0; |