diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-08-31 18:54:54 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-08-31 18:54:54 +0000 |
| commit | 4c7854d1dce24e8cc344f1da81fca01ee7f01804 (patch) | |
| tree | fd5a0613d299d10e9c9f8cf09ae04304e43697c8 /nptl/sysdeps/pthread | |
| parent | 936bb2647a835e63e99fa2d1590ab1e14aab4712 (diff) | |
| download | glibc-4c7854d1dce24e8cc344f1da81fca01ee7f01804.tar.gz glibc-4c7854d1dce24e8cc344f1da81fca01ee7f01804.tar.xz glibc-4c7854d1dce24e8cc344f1da81fca01ee7f01804.zip | |
Updated to fedora-glibc-20060831T1812 cvs/fedora-glibc-2_4_90-28
Diffstat (limited to 'nptl/sysdeps/pthread')
| -rw-r--r-- | nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c | 6 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/pthread_rwlock_wrlock.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c b/nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c index ab7bc7babb..97c0598f96 100644 --- a/nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c +++ b/nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003. @@ -40,9 +40,7 @@ pthread_rwlock_timedwrlock (rwlock, abstime) int err; /* Get the rwlock if there is no writer and no reader. */ - if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0 - && (rwlock->__data.__flags != 0 - || rwlock->__data.__nr_readers_queued == 0)) + if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0) { /* Mark self as writer. */ rwlock->__data.__writer = THREAD_GETMEM (THREAD_SELF, tid); diff --git a/nptl/sysdeps/pthread/pthread_rwlock_wrlock.c b/nptl/sysdeps/pthread/pthread_rwlock_wrlock.c index 4d967f2496..822aeed79c 100644 --- a/nptl/sysdeps/pthread/pthread_rwlock_wrlock.c +++ b/nptl/sysdeps/pthread/pthread_rwlock_wrlock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003. @@ -37,9 +37,7 @@ __pthread_rwlock_wrlock (rwlock) while (1) { /* Get the rwlock if there is no writer and no reader. */ - if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0 - && (rwlock->__data.__flags != 0 - || rwlock->__data.__nr_readers_queued == 0)) + if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0) { /* Mark self as writer. */ rwlock->__data.__writer = THREAD_GETMEM (THREAD_SELF, tid); |