remove two more bogus assertions, and add explanations

3 files changed, 16 insertions, 3 deletions

diff --git a/.topmsg b/.topmsg
index 629fe0f139..f59330bd62 100644
--- a/.topmsg
+++ b/.topmsg
@@ -1,7 +1,22 @@
 From: Samuel Thibault <samuel.thibault@ens-lyon.org>
 Subject: [PATCH] The critical section lock _can_ be held in these place.
 
-At least since hurd_thread_cancel can be called by another thread.
+At least since hurd_thread_cancel can be called by another thread and lock our
+critical lock.
+
+http://bugs.debian.org/46859
+
+“
+Thomas suggested that there is no need to take the critical section
+lock.  I believe that taking the critical section lock is necessary to
+prevent the target thread from entering a signal handler.  Roland will
+look into the problem.
+”
+
+Taking the critical section lock makes these assertions bogus.
+
+It happens that hurd_thread_cancel is only called from libports and inside
+/hurd/term so this is rare in practice.
 
 2006-08-05  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
diff --git a/hurd/hurdexec.c b/hurd/hurdexec.c
index 0ced7f32b4..1de90c0bc2 100644
--- a/hurd/hurdexec.c
+++ b/hurd/hurdexec.c
@@ -104,7 +104,6 @@ _hurd_exec (task_t task, file_t file,
 
   ss = _hurd_self_sigstate ();
 
-  assert (! __spin_lock_locked (&ss->critical_section_lock));
   __spin_lock (&ss->critical_section_lock);
 
   __spin_lock (&ss->lock);
diff --git a/hurd/thread-cancel.c b/hurd/thread-cancel.c
index 2e8d91e7ba..eaf3d9e342 100644
--- a/hurd/thread-cancel.c
+++ b/hurd/thread-cancel.c
@@ -90,7 +90,6 @@ hurd_check_cancel (void)
   int cancel;
 
   __spin_lock (&ss->lock);
-  assert (! __spin_lock_locked (&ss->critical_section_lock));
   cancel = ss->cancel;
   ss->cancel = 0;
   __spin_unlock (&ss->lock);