X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fbuffer-registry.h;h=440493d475f92c4472c746a8a31950c3792c8ebd;hb=0efb2ad7fc448283184e43d6fb0915febae45384;hp=db1ce0cbbbc821d338aa7edb3a81e2093e2e2084;hpb=fb83fe64f250bec7416f18891a8264450c61ead3;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/buffer-registry.h b/src/bin/lttng-sessiond/buffer-registry.h
index db1ce0cbb..440493d47 100644
--- a/src/bin/lttng-sessiond/buffer-registry.h
+++ b/src/bin/lttng-sessiond/buffer-registry.h
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2013 - David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef LTTNG_BUFFER_REGISTRY_H
@@ -25,14 +15,14 @@
 #include <common/hashtable/hashtable.h>
 
 #include "consumer.h"
-#include "ust-ctl.h"
+#include "lttng-ust-ctl.h"
 #include "ust-registry.h"
 
 struct buffer_reg_stream {
 	struct cds_list_head lnode;
 	union {
 		/* Original object data that MUST be copied over. */
-		struct lttng_ust_object_data *ust;
+		struct lttng_ust_abi_object_data *ust;
 	} obj;
 };
 
@@ -55,7 +45,7 @@ struct buffer_reg_channel {
 	size_t num_subbuf;
 	union {
 		/* Original object data that MUST be copied over. */
-		struct lttng_ust_object_data *ust;
+		struct lttng_ust_abi_object_data *ust;
 	} obj;
 };
 
@@ -152,7 +142,6 @@ void buffer_reg_destroy_registries(void);
 
 int buffer_reg_uid_consumer_channel_key(
 		struct cds_list_head *buffer_reg_uid_list,
-		uint64_t usess_id, uint64_t chan_key,
-		uint64_t *consumer_chan_key);
+		uint64_t chan_key, uint64_t *consumer_chan_key);
 
 #endif /* LTTNG_BUFFER_REGISTRY_H */