From 9c9da5ee89272282ea64341e856d1ece1367e737 Mon Sep 17 00:00:00 2001 From: Olivier Houchard Date: Fri, 18 Jan 2019 17:25:29 +0100 Subject: [PATCH] MINOR: muxes: Don't bother to LIST_DEL(&conn->list) before calling conn_free(). conn_free() already removes the connection from any idle list, so there's no need to do it in the mux code, just before calling conn_free(). --- src/mux_h1.c | 2 -- src/mux_h2.c | 2 -- src/mux_pt.c | 1 - 3 files changed, 5 deletions(-) diff --git a/src/mux_h1.c b/src/mux_h1.c index ead67e06e..3fe6f95cc 100644 --- a/src/mux_h1.c +++ b/src/mux_h1.c @@ -443,8 +443,6 @@ static void h1_release(struct connection *conn) { struct h1c *h1c = conn->ctx; - LIST_DEL(&conn->list); - if (h1c) { if (!LIST_ISEMPTY(&h1c->buf_wait.list)) { HA_SPIN_LOCK(BUF_WQ_LOCK, &buffer_wq_lock); diff --git a/src/mux_h2.c b/src/mux_h2.c index fabbe1c84..5fdaadf50 100644 --- a/src/mux_h2.c +++ b/src/mux_h2.c @@ -600,8 +600,6 @@ static void h2_release(struct connection *conn) { struct h2c *h2c = conn->ctx; - LIST_DEL(&conn->list); - if (h2c) { hpack_dht_free(h2c->ddht); diff --git a/src/mux_pt.c b/src/mux_pt.c index 462a7593a..4f53920c4 100644 --- a/src/mux_pt.c +++ b/src/mux_pt.c @@ -28,7 +28,6 @@ static void mux_pt_destroy(struct mux_pt_ctx *ctx) { struct connection *conn = ctx->conn; - LIST_DEL(&conn->list); conn_stop_tracking(conn); conn_full_close(conn); tasklet_free(ctx->wait_event.task);