Revert "Restart longpoll under lock when we'll be reusing it on pool switch to prevent derefs."

This reverts commit 2cae5c1dc3.

Gets stuck. Needs more thought.

main.c

@@ -2455,12 +2455,11 @@ static struct pool *priority_pool(int choice)
 	return ret;
 }
 
-static void __restart_longpoll(void);
+static void restart_longpoll(void);
 
 static void switch_pools(struct pool *selected)
 {
 	struct pool *pool, *last_pool;
-	bool new_pool = false;
 	int i, pool_no;
 
 	mutex_lock(&control_lock);
@@ -2508,23 +2507,13 @@ static void switch_pools(struct pool *selected)
 
 	currentpool = pools[pool_no];
 	pool = currentpool;
+	mutex_unlock(&control_lock);
 
 	if (pool != last_pool) {
-		new_pool = true;
+		applog(LOG_WARNING, "Switching to %s", pool->rpc_url);
 		/* Only switch longpoll if the new pool also supports LP */
 		if (pool->hdr_path)
-			__restart_longpoll();
+			restart_longpoll();
-	}
-
-	mutex_unlock(&control_lock);
-
-	if (new_pool) {
-		applog(LOG_WARNING, "Switching to %s", pool->rpc_url);
-		if (want_longpoll) {
-			if (opt_debug)
-				applog(LOG_DEBUG, "Pushing ping to longpoll thread");
-			tq_push(thr_info[longpoll_thr_id].q, &ping);
-		}
 	}
 
 	/* Reset the queued amount to allow more to be queued for the new pool */
@@ -3014,8 +3003,6 @@ retry:
 	opt_loginput = false;
 }
 
-static void restart_longpoll(void);
-
 static void set_options(void)
 {
 	int selected;
@@ -4485,23 +4472,6 @@ static void restart_longpoll(void)
 		start_longpoll();
 }
 
-/* Version for when we are holding a lock, grabs no other locks to prevent
- * deadlock */
-static void __restart_longpoll(void)
-{
-	struct thr_info *thr = &thr_info[longpoll_thr_id];
-
-	thr_info_cancel(thr);
-	have_longpoll = false;
-
-	if (!want_longpoll)
-		return;
-
-	tq_thaw(thr->q);
-	if (unlikely(thr_info_create(thr, NULL, longpoll_thread, thr)))
-		quit(1, "longpoll thread create failed");
-}
-
 static void *reinit_cpu(void *userdata)
 {
 	pthread_detach(pthread_self());