From: Sergey Bugaev <bugaevc@gmail.com>
Date: Fri, 14 Apr 2023 19:36:59 +0000 (+0300)
Subject: hurd: Simplify _S_catch_exception_raise
X-Git-Tag: glibc-2.38~364
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45000f12315c68f093293ec24d73860116bda0ba;p=thirdparty%2Fglibc.git

hurd: Simplify _S_catch_exception_raise

_hurd_thread_sigstate () already handles finding an existing sigstate
before allocating a new one, so just use that. Bonus: this will only
lock the _hurd_siglock once.

Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
---

diff --git a/hurd/catch-exc.c b/hurd/catch-exc.c
index 5ee2233aa9a..d375bf6789f 100644
--- a/hurd/catch-exc.c
+++ b/hurd/catch-exc.c
@@ -58,13 +58,7 @@ _S_catch_exception_raise (mach_port_t port,
   _hurd_exception2signal (&d, &signo);
 
   /* Find the sigstate structure for the faulting thread.  */
-  __mutex_lock (&_hurd_siglock);
-  for (ss = _hurd_sigstates; ss != NULL; ss = ss->next)
-    if (ss->thread == thread)
-      break;
-  __mutex_unlock (&_hurd_siglock);
-  if (ss == NULL)
-    ss = _hurd_thread_sigstate (thread); /* Allocate a fresh one.  */
+  ss = _hurd_thread_sigstate (thread);
 
   if (__spin_lock_locked (&ss->lock))
     {