Rename struct channel to struct lttng_kernel_ring_buffer_channel

[lttng-modules.git] / include / ringbuffer / frontend_types.h

diff --git a/include/ringbuffer/frontend_types.h b/include/ringbuffer/frontend_types.h
index de205337ce9c8ccdc53f7c7fcb93428f44a38588..a671c33bfb86dce6bdb61bec0c4f0655781fcea2 100644 (file)
--- a/include/ringbuffer/frontend_types.h
+++ b/include/ringbuffer/frontend_types.h
@@ -41,7 +41,7 @@ struct channel_iter {
 };
 
 /* channel: collection of per-cpu ring buffers. */
-struct channel {
+struct lttng_kernel_ring_buffer_channel {
        atomic_t record_disabled;
        unsigned long commit_count_mask;        /*
                                                 * Commit count mask, removing
@@ -54,7 +54,7 @@ struct channel {
 
        unsigned long switch_timer_interval;    /* Buffer flush (jiffies) */
        unsigned long read_timer_interval;      /* Reader wakeup (jiffies) */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,10,0))
        struct lttng_cpuhp_node cpuhp_prepare;
        struct lttng_cpuhp_node cpuhp_online;
        struct lttng_cpuhp_node cpuhp_iter_online;
@@ -164,12 +164,12 @@ struct lib_ring_buffer {
 };
 
 static inline
-void *channel_get_private(struct channel *chan)
+void *channel_get_private(struct lttng_kernel_ring_buffer_channel *chan)
 {
        return chan->backend.priv;
 }
 
-void lib_ring_buffer_lost_event_too_big(struct channel *chan);
+void lib_ring_buffer_lost_event_too_big(struct lttng_kernel_ring_buffer_channel *chan);
 
 /*
  * Issue warnings and disable channels upon internal error.
@@ -178,14 +178,14 @@ void lib_ring_buffer_lost_event_too_big(struct channel *chan);
  */
 #define CHAN_WARN_ON(c, cond)                                          \
        ({                                                              \
-               struct channel *__chan;                                 \
+               struct lttng_kernel_ring_buffer_channel *__chan;        \
                int _____ret = unlikely(cond);                          \
                if (_____ret) {                                         \
                        if (__same_type(*(c), struct channel_backend))  \
                                __chan = container_of((void *) (c),     \
-                                                       struct channel, \
+                                                       struct lttng_kernel_ring_buffer_channel, \
                                                        backend);       \
-                       else if (__same_type(*(c), struct channel))     \
+                       else if (__same_type(*(c), struct lttng_kernel_ring_buffer_channel)) \
                                __chan = (void *) (c);                  \
                        else                                            \
                                BUG_ON(1);                              \