X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=f10a3dadf0133747484b8302bd078d1bf3b5b3cd;hp=ed140f0740ca9676ec8d2f3a3ba9c6ca3aa7937c;hb=8eede8357545adb000ba9cbd29e1a7b6d71ceb38;hpb=40bbd087934edf0be7c21165786aad3fabb7e7b5 diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c index ed140f074..f10a3dadf 100644 --- a/src/bin/lttng-sessiond/ust-app.c +++ b/src/bin/lttng-sessiond/ust-app.c @@ -2347,8 +2347,7 @@ end: * Called with UST app session lock held and a RCU read side lock. */ static -int create_ust_app_channel_context(struct ust_app_session *ua_sess, - struct ust_app_channel *ua_chan, +int create_ust_app_channel_context(struct ust_app_channel *ua_chan, struct lttng_ust_context_attr *uctx, struct ust_app *app) { @@ -5224,7 +5223,7 @@ int ust_app_add_ctx_channel_glb(struct ltt_ust_session *usess, } ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node); - ret = create_ust_app_channel_context(ua_sess, ua_chan, &uctx->ctx, app); + ret = create_ust_app_channel_context(ua_chan, &uctx->ctx, app); if (ret < 0) { goto next_app; } @@ -5420,7 +5419,7 @@ error: * * On success 0 is returned else a negative value. */ -static int reply_ust_register_channel(int sock, int sobjd, int cobjd, +static int reply_ust_register_channel(int sock, int cobjd, size_t nr_fields, struct ustctl_field *fields) { int ret, ret_code = 0; @@ -5798,7 +5797,7 @@ int ust_app_recv_notify(int sock) * that if needed it will be freed. After this, it's invalid to access * fields or clean it up. */ - ret = reply_ust_register_channel(sock, sobjd, cobjd, nr_fields, + ret = reply_ust_register_channel(sock, cobjd, nr_fields, fields); if (ret < 0) { goto error;