lxclock: remove pthread_atfork_handlers

They shouldn't be needed anymore.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/attach.c b/src/lxc/attach.c
index c3bb8bfb0f0f017f108b44ad0cd48389185aa7ef..28c2cadfd0f4b495dd5055993c515a4a02021c95 100644 (file)
--- a/src/lxc/attach.c
+++ b/src/lxc/attach.c
@@ -1242,13 +1242,10 @@ int lxc_attach(const char *name, const char *lxcpath,
                return -1;
        }
 
-       /* Create intermediate subprocess, three reasons:
-        *       1. Runs all pthread_atfork handlers and the child will no
-        *          longer be threaded (we can't properly setns() in a threaded
-        *          process).
-        *       2. We can't setns() in the child itself, since we want to make
+       /* Create intermediate subprocess, two reasons:
+        *       1. We can't setns() in the child itself, since we want to make
         *          sure we are properly attached to the pidns.
-        *       3. Also, the initial thread has to put the attached process
+        *       2. Also, the initial thread has to put the attached process
         *          into the cgroup, which we can only do if we didn't already
         *          setns() (otherwise, user namespaces will hate us).
         */

diff --git a/src/lxc/lxclock.c b/src/lxc/lxclock.c
index dee5aa5f01adefdbec99709c0401b4cfa72c5431..87496f681af0fa851784676aa9a93f3305d31d3f 100644 (file)
--- a/src/lxc/lxclock.c
+++ b/src/lxc/lxclock.c
@@ -317,23 +317,6 @@ void process_unlock(void)
        unlock_mutex(&thread_mutex);
 }
 
-/* One thread can do fork() while another one is holding a mutex.
- * There is only one thread in child just after the fork(), so no one will ever release that mutex.
- * We setup a "child" fork handler to unlock the mutex just after the fork().
- * For several mutex types, unlocking an unlocked mutex can lead to undefined behavior.
- * One way to deal with it is to setup "prepare" fork handler
- * to lock the mutex before fork() and both "parent" and "child" fork handlers
- * to unlock the mutex.
- * This forbids doing fork() while explicitly holding the lock.
- */
-#ifdef HAVE_PTHREAD_ATFORK
-__attribute__((constructor))
-static void process_lock_setup_atfork(void)
-{
-       pthread_atfork(process_lock, process_unlock, process_unlock);
-}
-#endif
-
 int container_mem_lock(struct lxc_container *c)
 {
        return lxclock(c->privlock, 0);