Update error check for root handle

[lttng-ust.git] / libust / lttng-ust-comm.c

diff --git a/libust/lttng-ust-comm.c b/libust/lttng-ust-comm.c
index 2e7e1a3515abd1f6b46024364ddb1747057e8a4f..6bf9e2b5b350ebb2936507a054a1236c578f9b7c 100644 (file)
--- a/libust/lttng-ust-comm.c
+++ b/libust/lttng-ust-comm.c
@@ -294,6 +294,7 @@ end:
                shm_fd = lum->u.stream.shm_fd;
                wait_fd = lum->u.stream.wait_fd;
                break;
+       case LTTNG_UST_METADATA:
        case LTTNG_UST_CHANNEL:
                lur.u.channel.memory_map_size = lum->u.channel.memory_map_size;
                shm_fd = lum->u.channel.shm_fd;
@@ -306,7 +307,9 @@ end:
                goto error;
        }
 
-       if ((lum->cmd == LTTNG_UST_STREAM || lum->cmd == LTTNG_UST_CHANNEL)
+       if ((lum->cmd == LTTNG_UST_STREAM
+            || lum->cmd == LTTNG_UST_CHANNEL
+            || lum->cmd == LTTNG_UST_METADATA)
                        && lur.ret_code == LTTCOMM_OK) {
                /* we also need to send the file descriptors. */
                ret = lttcomm_send_fds_unix_sock(sock,
@@ -638,7 +641,7 @@ restart:
         */
        if (sock_info->root_handle == -1) {
                ret = lttng_abi_create_root_handle();
-               if (ret) {
+               if (ret < 0) {
                        ERR("Error creating root handle");
                        ust_unlock();
                        goto quit;