sessiond: Split ust_registry_session into per-type classes

[lttng-tools.git] / src / bin / lttng-sessiond / buffer-registry.cpp

diff --git a/src/bin/lttng-sessiond/buffer-registry.cpp b/src/bin/lttng-sessiond/buffer-registry.cpp
index 7a446633b8f878cbd6cfaad67a2a07ee33dd281b..360af749d587d6ebe4c5d09807d55d116295100c 100644 (file)
--- a/src/bin/lttng-sessiond/buffer-registry.cpp
+++ b/src/bin/lttng-sessiond/buffer-registry.cpp
@@ -601,7 +601,6 @@ static void buffer_reg_session_destroy(struct buffer_reg_session *regp,
        switch (domain) {
        case LTTNG_DOMAIN_UST:
                ust_registry_session_destroy(regp->reg.ust);
-               free(regp->reg.ust);
                break;
        default:
                abort();
@@ -681,10 +680,10 @@ void buffer_reg_uid_destroy(struct buffer_reg_uid *regp,
 
        switch (regp->domain) {
        case LTTNG_DOMAIN_UST:
-               if (regp->registry->reg.ust->metadata_key) {
+               if (regp->registry->reg.ust->_metadata_key) {
                        /* Return value does not matter. This call will print errors. */
                        (void) consumer_close_metadata(socket,
-                                       regp->registry->reg.ust->metadata_key);
+                                       regp->registry->reg.ust->_metadata_key);
                }
                break;
        default: