diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-02-15 17:20:33 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-02-15 17:20:33 +0000 |
| commit | 683040c3b2c7dc2bc08045202a0a0b46d143b3cb (patch) | |
| tree | fcd73510f2bcfcdf57078331d800db4217db759b /nptl/pthread_mutex_consistent.c | |
| parent | b007ce7cc6971e4bd4cd91c558efd3d4603d941d (diff) | |
| download | glibc-683040c3b2c7dc2bc08045202a0a0b46d143b3cb.tar glibc-683040c3b2c7dc2bc08045202a0a0b46d143b3cb.tar.gz glibc-683040c3b2c7dc2bc08045202a0a0b46d143b3cb.tar.bz2 glibc-683040c3b2c7dc2bc08045202a0a0b46d143b3cb.zip | |
* sysdeps/unix/sysv/linux/not-cancel.h (__openat_not_cancel,
__openat64_not_cancel): Remove prototypes.
(__openat_nocancel, __openat64_nocancel): New prototypes or defines.
(openat_not_cancel, openat_not_cancel_3, openat64_not_cancel,
openat64_not_cancel_3): Use them.
Diffstat (limited to 'nptl/pthread_mutex_consistent.c')
| -rw-r--r-- | nptl/pthread_mutex_consistent.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nptl/pthread_mutex_consistent.c b/nptl/pthread_mutex_consistent.c index 2edfe8a5a6..0cfe972da0 100644 --- a/nptl/pthread_mutex_consistent.c +++ b/nptl/pthread_mutex_consistent.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2005 Free Software Foundation, Inc. +/* Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2005. @@ -27,10 +27,10 @@ pthread_mutex_consistent_np (mutex) { /* Test whether this is a robust mutex with a dead owner. */ if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_PRIVATE_NP) == 0 - || mutex->__data.__owner != -THREAD_GETMEM (THREAD_SELF, tid)) + || mutex->__data.__owner != PTHREAD_MUTEX_INCONSISTENT) return EINVAL; - mutex->__data.__owner = -mutex->__data.__owner; + mutex->__data.__owner = THREAD_GETMEM (THREAD_SELF, tid); return 0; } |