From: Willy Tarreau <w@1wt.eu>
Date: Sat, 27 Jun 2020 22:31:13 +0000 (+0200)
Subject: BUG/MINOR: mux_h2: don't lose the leaving trace in h2_io_cb()
X-Git-Tag: v2.2-dev12~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=38468773293eb6f6bce23de1591818201c12f94b;p=thirdparty%2Fhaproxy.git

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

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.
---

diff --git a/src/mux_h2.c b/src/mux_h2.c
index 9928b32c76..bec6af0044 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -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]);
 		tasklet_free(tl);
-		return NULL;
+		goto leave;
 	}
 	h2c = ctx;
 	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);
 	}
 
+leave:
 	TRACE_LEAVE(H2_EV_H2C_WAKE);
 	return NULL;
 }