Hurd: setitimer.c: Fix unlock in error patch

diff --git a/ChangeLog b/ChangeLog
index b373406c034473b50a2c105f2662b887058d37d4..e49be8d46674cbc5a94b32ee33f5a9d553b645c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-05-10  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
+        * sysdeps/mach/hurd/setitimer.c (setitimer_locked): Use common exit
+       path instead of returning without unlocking.
+
        * sysdeps/mach/hurd/bits/ioctls.h (_IOIW): New macro for
        immediate-write ioctls.
        * sysdeps/mach/hurd/ioctl.c: Handle cases with no arguments.

diff --git a/sysdeps/mach/hurd/setitimer.c b/sysdeps/mach/hurd/setitimer.c
index a7b2e29d1689f76529f793c8e87e44bc01750303..00cd0cc445540e24bf4f368c07795f198941d139 100644 (file)
--- a/sysdeps/mach/hurd/setitimer.c
+++ b/sysdeps/mach/hurd/setitimer.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1994,1995,1996,1997,2000,2001,2005
-       Free Software Foundation, Inc.
+/* Copyright (C) 1994-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -219,7 +218,7 @@ setitimer_locked (const struct itimerval *new, struct itimerval *old,
          /* Start up the itimer thread running `timer_thread' (below).  */
          if (err = __thread_create (__mach_task_self (),
                                     &_hurd_itimer_thread))
-           return __hurd_fail (err);
+           goto out;
          _hurd_itimer_thread_stack_base = 0; /* Anywhere.  */
          _hurd_itimer_thread_stack_size = __vm_page_size; /* Small stack.  */
          if (err = __mach_setup_thread (__mach_task_self (),