]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: muxes: Don't bother to LIST_DEL(&conn->list) before calling conn_free().
authorOlivier Houchard <ohouchard@haproxy.com>
Fri, 18 Jan 2019 16:25:29 +0000 (17:25 +0100)
committerWilly Tarreau <w@1wt.eu>
Thu, 31 Jan 2019 18:38:25 +0000 (19:38 +0100)
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
src/mux_h2.c
src/mux_pt.c

index ead67e06e2a316e1bee8aaf8442997b2f043eae9..3fe6f95cc0b5c6c90dfd47b935faa89f681212df 100644 (file)
@@ -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);
index fabbe1c84804df97af6822a7e55b45dc17648333..5fdaadf500d23bf6dc061e9466ce095220b48820 100644 (file)
@@ -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);
 
index 462a7593aaaabe4bdae0ee3cbf9f39b5daf997bf..4f53920c418579de034ecc69289c411b195d2af0 100644 (file)
@@ -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);