From: Willy Tarreau <w@1wt.eu>
Date: Thu, 28 Feb 2019 15:06:56 +0000 (+0100)
Subject: MINOR: server: remove a few unneeded LIST_INIT calls after LIST_DEL_LOCKED
X-Git-Tag: v2.0-dev2~149
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c912f94b576b2cbc868b29a168648ad50682673d;p=thirdparty%2Fhaproxy.git

MINOR: server: remove a few unneeded LIST_INIT calls after LIST_DEL_LOCKED

Since LIST_DEL_LOCKED() and LIST_POP_LOCKED() now automatically reinitialize
the removed element, there's no need for keeping this LIST_INIT() call in the
idle connection code.
---

diff --git a/include/proto/connection.h b/include/proto/connection.h
index 3bfad58ef2..1326a15f97 100644
--- a/include/proto/connection.h
+++ b/include/proto/connection.h
@@ -699,7 +699,6 @@ static inline void conn_free(struct connection *conn)
 
 	conn_force_unsubscribe(conn);
 	LIST_DEL_LOCKED(&conn->list);
-	LIST_INIT(&conn->list);
 	pool_free(pool_head_connection, conn);
 }
 
diff --git a/src/backend.c b/src/backend.c
index ace0ca4020..dfdb9b5319 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -1308,11 +1308,9 @@ int connect_server(struct stream *s)
 		    (((s->be->options & PR_O_REUSE_MASK) != PR_O_REUSE_NEVR) &&
 		     s->txn && (s->txn->flags & TX_NOT_FIRST)))) {
 			srv_conn = LIST_POP_LOCKED(&srv->idle_orphan_conns[tid],
-			    struct connection *, list);
-			if (srv_conn) {
-				LIST_INIT(&srv_conn->list);
+			                           struct connection *, list);
+			if (srv_conn)
 				reuse_orphan = 1;
-			}
 		}
 
 		/* If we've picked a connection from the pool, we now have to
diff --git a/src/server.c b/src/server.c
index b9336f5650..bffc2ee50c 100644
--- a/src/server.c
+++ b/src/server.c
@@ -5317,7 +5317,6 @@ struct task *srv_cleanup_toremove_connections(struct task *task, void *context,
 
 	while ((conn = LIST_POP_LOCKED(&toremove_connections[tid],
 	                               struct connection *, list)) != NULL) {
-		LIST_INIT(&conn->list);
 		conn->mux->destroy(conn);
 	}