Version 2.4.4

[lttng-modules.git] / lttng-abi.c

diff --git a/lttng-abi.c b/lttng-abi.c
index 1cc9510110dbc216ecf02c4ca8157dfc8f12a78e..9a6c8ee920fa0dee16fa4f086534cbc99f4348d0 100644 (file)
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -841,6 +841,7 @@ int lttng_abi_open_metadata_stream(struct file *channel_file)
        metadata_stream->priv = buf;
        stream_priv = metadata_stream;
        metadata_stream->transport = channel->transport;
+       mutex_init(&metadata_stream->lock);
 
        /*
         * Since life-time of metadata cache differs from that of
@@ -1347,7 +1348,7 @@ static long lttng_stream_ring_buffer_ioctl(struct file *filp,
        struct lib_ring_buffer *buf = filp->private_data;
        struct channel *chan = buf->backend.chan;
        const struct lib_ring_buffer_config *config = &chan->backend.config;
-       struct lttng_channel *lttng_chan = channel_get_private(chan);
+       const struct lttng_channel_ops *ops = chan->backend.priv_ops;
        int ret;
 
        if (atomic_read(&chan->record_disabled))
@@ -1358,9 +1359,7 @@ static long lttng_stream_ring_buffer_ioctl(struct file *filp,
        {
                uint64_t ts;
 
-               if (!lttng_chan->ops)
-                       goto error;
-               ret = lttng_chan->ops->timestamp_begin(config, buf, &ts);
+               ret = ops->timestamp_begin(config, buf, &ts);
                if (ret < 0)
                        goto error;
                return put_u64(ts, arg);
@@ -1369,9 +1368,7 @@ static long lttng_stream_ring_buffer_ioctl(struct file *filp,
        {
                uint64_t ts;
 
-               if (!lttng_chan->ops)
-                       goto error;
-               ret = lttng_chan->ops->timestamp_end(config, buf, &ts);
+               ret = ops->timestamp_end(config, buf, &ts);
                if (ret < 0)
                        goto error;
                return put_u64(ts, arg);
@@ -1380,9 +1377,7 @@ static long lttng_stream_ring_buffer_ioctl(struct file *filp,
        {
                uint64_t ed;
 
-               if (!lttng_chan->ops)
-                       goto error;
-               ret = lttng_chan->ops->events_discarded(config, buf, &ed);
+               ret = ops->events_discarded(config, buf, &ed);
                if (ret < 0)
                        goto error;
                return put_u64(ed, arg);
@@ -1391,9 +1386,7 @@ static long lttng_stream_ring_buffer_ioctl(struct file *filp,
        {
                uint64_t cs;
 
-               if (!lttng_chan->ops)
-                       goto error;
-               ret = lttng_chan->ops->content_size(config, buf, &cs);
+               ret = ops->content_size(config, buf, &cs);
                if (ret < 0)
                        goto error;
                return put_u64(cs, arg);
@@ -1402,9 +1395,7 @@ static long lttng_stream_ring_buffer_ioctl(struct file *filp,
        {
                uint64_t ps;
 
-               if (!lttng_chan->ops)
-                       goto error;
-               ret = lttng_chan->ops->packet_size(config, buf, &ps);
+               ret = ops->packet_size(config, buf, &ps);
                if (ret < 0)
                        goto error;
                return put_u64(ps, arg);
@@ -1413,9 +1404,7 @@ static long lttng_stream_ring_buffer_ioctl(struct file *filp,
        {
                uint64_t si;
 
-               if (!lttng_chan->ops)
-                       goto error;
-               ret = lttng_chan->ops->stream_id(config, buf, &si);
+               ret = ops->stream_id(config, buf, &si);
                if (ret < 0)
                        goto error;
                return put_u64(si, arg);
@@ -1424,9 +1413,7 @@ static long lttng_stream_ring_buffer_ioctl(struct file *filp,
        {
                uint64_t ts;
 
-               if (!lttng_chan->ops)
-                       goto error;
-               ret = lttng_chan->ops->current_timestamp(config, buf, &ts);
+               ret = ops->current_timestamp(config, buf, &ts);
                if (ret < 0)
                        goto error;
                return put_u64(ts, arg);
@@ -1447,7 +1434,7 @@ static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
        struct lib_ring_buffer *buf = filp->private_data;
        struct channel *chan = buf->backend.chan;
        const struct lib_ring_buffer_config *config = &chan->backend.config;
-       struct lttng_channel *lttng_chan = channel_get_private(chan);
+       const struct lttng_channel_ops *ops = chan->backend.priv_ops;
        int ret;
 
        if (atomic_read(&chan->record_disabled))
@@ -1458,9 +1445,7 @@ static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
        {
                uint64_t ts;
 
-               if (!lttng_chan->ops)
-                       goto error;
-               ret = lttng_chan->ops->timestamp_begin(config, buf, &ts);
+               ret = ops->timestamp_begin(config, buf, &ts);
                if (ret < 0)
                        goto error;
                return put_u64(ts, arg);
@@ -1469,9 +1454,7 @@ static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
        {
                uint64_t ts;
 
-               if (!lttng_chan->ops)
-                       goto error;
-               ret = lttng_chan->ops->timestamp_end(config, buf, &ts);
+               ret = ops->timestamp_end(config, buf, &ts);
                if (ret < 0)
                        goto error;
                return put_u64(ts, arg);
@@ -1480,9 +1463,7 @@ static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
        {
                uint64_t ed;
 
-               if (!lttng_chan->ops)
-                       goto error;
-               ret = lttng_chan->ops->events_discarded(config, buf, &ed);
+               ret = ops->events_discarded(config, buf, &ed);
                if (ret < 0)
                        goto error;
                return put_u64(ed, arg);
@@ -1491,9 +1472,7 @@ static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
        {
                uint64_t cs;
 
-               if (!lttng_chan->ops)
-                       goto error;
-               ret = lttng_chan->ops->content_size(config, buf, &cs);
+               ret = ops->content_size(config, buf, &cs);
                if (ret < 0)
                        goto error;
                return put_u64(cs, arg);
@@ -1502,9 +1481,7 @@ static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
        {
                uint64_t ps;
 
-               if (!lttng_chan->ops)
-                       goto error;
-               ret = lttng_chan->ops->packet_size(config, buf, &ps);
+               ret = ops->packet_size(config, buf, &ps);
                if (ret < 0)
                        goto error;
                return put_u64(ps, arg);
@@ -1513,9 +1490,7 @@ static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
        {
                uint64_t si;
 
-               if (!lttng_chan->ops)
-                       goto error;
-               ret = lttng_chan->ops->stream_id(config, buf, &si);
+               ret = ops->stream_id(config, buf, &si);
                if (ret < 0)
                        goto error;
                return put_u64(si, arg);
@@ -1524,9 +1499,7 @@ static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
        {
                uint64_t ts;
 
-               if (!lttng_chan->ops)
-                       goto error;
-               ret = lttng_chan->ops->current_timestamp(config, buf, &ts);
+               ret = ops->current_timestamp(config, buf, &ts);
                if (ret < 0)
                        goto error;
                return put_u64(ts, arg);