Patchwork nptl: correct comment in pthread_mutex_trylock

login
register
mail settings
Submitter Wolfram Sang
Date Feb. 19, 2019, 2:20 p.m.
Message ID <20190219142032.2894-1-wsa@the-dreams.de>
Download mbox | patch
Permalink /patch/31523/
State New
Headers show

Comments

Wolfram Sang - Feb. 19, 2019, 2:20 p.m.
I found this typo when educating myself about the EOWNERDEAD topic.
---

I don't have a CA and I don't think I need one with this trivial change being
my first glibc contribution. Let me know if you disagree.

It's a funny typo, though :)

 nptl/pthread_mutex_trylock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Carlos O'Donell - Feb. 19, 2019, 4:01 p.m.
On 2/19/19 9:20 AM, Wolfram Sang wrote:
> I found this typo when educating myself about the EOWNERDEAD topic.
> ---
> 
> I don't have a CA and I don't think I need one with this trivial change being
> my first glibc contribution. Let me know if you disagree.
> 
> It's a funny typo, though :)
> 
>  nptl/pthread_mutex_trylock.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/nptl/pthread_mutex_trylock.c b/nptl/pthread_mutex_trylock.c
> index bf2869eca2..3bba464409 100644
> --- a/nptl/pthread_mutex_trylock.c
> +++ b/nptl/pthread_mutex_trylock.c
> @@ -130,7 +130,7 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex)
>  	      __asm ("" ::: "memory");
>  	      THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL);
>  
> -	      /* Note that we deliberately exist here.  If we fall
> +	      /* Note that we deliberately exit here.  If we fall
>  		 through to the end of the function __nusers would be
>  		 incremented which is not correct because the old
>  		 owner has to be discounted.  */

Pushed. Thanks for the fix :-)

commit 04de93022685bd19347c3ded5ac50b09e2037243 (HEAD -> master, origin/master, origin/HEAD)
Author: Wolfram Sang <wsa@the-dreams.de>
Date:   Tue Feb 19 10:59:31 2019 -0500

    nptl: Fix comment typo in pthread_mutex_trylock.c

Patch

diff --git a/nptl/pthread_mutex_trylock.c b/nptl/pthread_mutex_trylock.c
index bf2869eca2..3bba464409 100644
--- a/nptl/pthread_mutex_trylock.c
+++ b/nptl/pthread_mutex_trylock.c
@@ -130,7 +130,7 @@  __pthread_mutex_trylock (pthread_mutex_t *mutex)
 	      __asm ("" ::: "memory");
 	      THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL);
 
-	      /* Note that we deliberately exist here.  If we fall
+	      /* Note that we deliberately exit here.  If we fall
 		 through to the end of the function __nusers would be
 		 incremented which is not correct because the old
 		 owner has to be discounted.  */