From: Ondřej Surý <ondrej@isc.org>
Date: Tue, 11 Jan 2022 13:49:51 +0000 (+0100)
Subject: Revert "Always enqueue isc__nm_tcp_resumeread()"
X-Git-Tag: v9.18.0~20^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a4e91ee47222138ba39d014996e469839d262a3;p=thirdparty%2Fbind9.git

Revert "Always enqueue isc__nm_tcp_resumeread()"

The commit itself is harmless, but at the same time it is also useless,
so we are reverting it.

This reverts commit 11c869a3d53eafa4083b404e6b6686a120919c26.
---

diff --git a/lib/isc/netmgr/tcp.c b/lib/isc/netmgr/tcp.c
index 186bb83cf44..2a600c14300 100644
--- a/lib/isc/netmgr/tcp.c
+++ b/lib/isc/netmgr/tcp.c
@@ -816,7 +816,6 @@ isc__nm_tcp_resumeread(isc_nmhandle_t *handle) {
 
 	isc__netievent_tcpstartread_t *ievent = NULL;
 	isc_nmsocket_t *sock = handle->sock;
-	isc__networker_t *worker = &sock->mgr->workers[sock->tid];
 
 	REQUIRE(sock->tid == isc_nm_tid());
 
@@ -838,18 +837,8 @@ isc__nm_tcp_resumeread(isc_nmhandle_t *handle) {
 
 	ievent = isc__nm_get_netievent_tcpstartread(sock->mgr, sock);
 
-	if (worker->recvbuf_inuse) {
-		/*
-		 * If we happen to call the resumeread from inside the receive
-		 * callback, the worker->recvbuf might still be in use, so we
-		 * need to force enqueue the next read event.
-		 */
-		isc__nm_enqueue_ievent(worker, (isc__netievent_t *)ievent);
-
-	} else {
-		isc__nm_maybe_enqueue_ievent(worker,
-					     (isc__netievent_t *)ievent);
-	}
+	isc__nm_maybe_enqueue_ievent(&sock->mgr->workers[sock->tid],
+				     (isc__netievent_t *)ievent);
 }
 
 void