mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-23 14:51:27 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: mux_h2: don't lose the leaving trace in h2_io_cb()

Browse Source 
Commit cd4159f ("MEDIUM: mux_h2: Implement the takeover() method.")
added a return in the middle of the function, and as usual with such
stray return statements, some unrolling was lost. Here it's only the
TRACE_LEAVE() call, so it's mostly harmless. That's 2.2 only, no
backport is needed.
This commit is contained in:
Willy Tarreau 2020-06-28 00:31:13 +02:00
parent 4462af8da2
commit 3846877329
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mux_h2.c
View File

@ -3532,7 +3532,7 @@ static struct task *h2_io_cb(struct task *t, void *ctx, unsigned short status)
*/ */
HA_SPIN_UNLOCK(OTHER_LOCK, &toremove_lock[tid]); HA_SPIN_UNLOCK(OTHER_LOCK, &toremove_lock[tid]);
tasklet_free(tl); tasklet_free(tl);
return NULL; goto leave;
} }
h2c = ctx; h2c = ctx;
conn = h2c->conn; conn = h2c->conn;
@ -3570,6 +3570,7 @@ static struct task *h2_io_cb(struct task *t, void *ctx, unsigned short status)
MT_LIST_ADDQ(&srv->idle_conns[tid], &conn->list); MT_LIST_ADDQ(&srv->idle_conns[tid], &conn->list);
} }
leave:
TRACE_LEAVE(H2_EV_H2C_WAKE); TRACE_LEAVE(H2_EV_H2C_WAKE);
return NULL; return NULL;
} }