Merge branch 'master' of git://git.lttng.org/lttng-tools

diff --combined lttng-sessiond/ust-app.c
index 4f68a87eecd86270cc0011cd528d38c79ec3fc96,063a2fd0a528af211ef6ab4e82baf0acb6cc8a8b..3de826bc2d97d8ca8850735af366291a4afb6c86
--- 1/lttng-sessiond/ust-app.c
--- 2/lttng-sessiond/ust-app.c
+++ b/lttng-sessiond/ust-app.c
@@@ -584,7 -584,7 +584,7 @@@ static int create_ust_channel(struct us
        ret = ustctl_create_channel(app->key.sock, ua_sess->handle,
                        (struct lttng_ust_channel_attr *)&ua_chan->attr, &ua_chan->obj);
        if (ret < 0) {
 -              DBG("Error creating channel %s for app (pid: %d, sock: %d) "
 +              ERR("Creating channel %s for app (pid: %d, sock: %d) "
                                "and session handle %d with ret %d",
                                ua_chan->name, app->key.pid, app->key.sock,
                                ua_sess->handle, ret);
@@@ -592,9 -592,6 +592,6 @@@
        }
  
        ua_chan->handle = ua_chan->obj->handle;
-       ua_chan->attr.shm_fd = ua_chan->obj->shm_fd;
-       ua_chan->attr.wait_fd = ua_chan->obj->wait_fd;
-       ua_chan->attr.memory_map_size = ua_chan->obj->memory_map_size;
  
        DBG2("UST app channel %s created successfully for pid:%d and sock:%d",
                        ua_chan->name, app->key.pid, app->key.sock);
@@@ -1062,6 -1059,8 +1059,6 @@@ static struct ust_app_channel *create_u
                        goto error;
                }
                shadow_copy_channel(ua_chan, uchan);
 -
 -              lttng_ht_add_unique_str(ua_sess->channels, &ua_chan->node);
        } else {
                ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node);
        }
@@@ -1071,8 -1070,6 +1068,8 @@@
                goto error;
        }
  
 +      lttng_ht_add_unique_str(ua_sess->channels, &ua_chan->node);
 +
        return ua_chan;
  
  error: