From: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Date: Mon, 29 Oct 2018 20:36:01 +0000 (+0000)
Subject: git-libpthread-trylock
X-Git-Tag: archive/raspbian/2.27-8+rpi1^2~63
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d06fb6b2bcce35836ef147a7a6e4c1a23237a0df;p=glibc.git

git-libpthread-trylock

commit 55c35d62a3a6ae0d90db40c6e4a2d94d05be71e3
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Sat Feb 24 20:20:33 2018 +0100

    Fix pthread_mutex_trylock return value

    * sysdeps/mach/hurd/pt-mutex-trylock.c (__pthread_mutex_trylock): Return
    EBUSY on failure instead of -1.


Gbp-Pq: Topic hurd-i386
Gbp-Pq: Name git-libpthread-trylock.diff
---

diff --git a/libpthread/sysdeps/mach/hurd/pt-mutex-trylock.c b/libpthread/sysdeps/mach/hurd/pt-mutex-trylock.c
index 66800940e..59244e835 100644
--- a/libpthread/sysdeps/mach/hurd/pt-mutex-trylock.c
+++ b/libpthread/sysdeps/mach/hurd/pt-mutex-trylock.c
@@ -32,6 +32,8 @@ int __pthread_mutex_trylock (pthread_mutex_t *mtxp)
     {
       case PT_MTX_NORMAL:
         ret = lll_trylock (&mtxp->__lock);
+        if (ret)
+          ret = EBUSY;
         break;
 
       case PT_MTX_RECURSIVE:
@@ -49,6 +51,8 @@ int __pthread_mutex_trylock (pthread_mutex_t *mtxp)
             mtx_set_owner (mtxp, self, mtxp->__flags);
             mtxp->__cnt = 1;
           }
+        else
+          ret = EBUSY;
 
         break;
 
@@ -56,6 +60,8 @@ int __pthread_mutex_trylock (pthread_mutex_t *mtxp)
         self = _pthread_self ();
         if ((ret = lll_trylock (&mtxp->__lock)) == 0)
           mtx_set_owner (mtxp, self, mtxp->__flags);
+        else
+          ret = EBUSY;
         break;
 
       case PT_MTX_NORMAL     | PTHREAD_MUTEX_ROBUST: