Merged all the way to 2.4, thanks! Jérémie
On Fri, Nov 21, 2014 at 12:38 PM, Mathieu Desnoyers <[email protected]> wrote: > Signed-off-by: Mathieu Desnoyers <[email protected]> > --- > src/bin/lttng-relayd/live.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c > index a76f530..93d458b 100644 > --- a/src/bin/lttng-relayd/live.c > +++ b/src/bin/lttng-relayd/live.c > @@ -1318,7 +1318,7 @@ int viewer_get_next_index(struct relay_connection *conn) > ret = check_index_status(vstream, rstream, ctf_trace, &viewer_index); > pthread_mutex_unlock(&rstream->viewer_stream_rotation_lock); > if (ret < 0) { > - goto end; > + goto end_unlock; > } else if (ret == 1) { > /* > * This means the viewer index data structure has been > populated by the > -- > 2.1.1 > -- Jérémie Galarneau EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
