Update ChangeLog to 2.0-pre14

[lttng-modules.git] / lib / ringbuffer / ring_buffer_mmap.c

diff --git a/lib/ringbuffer/ring_buffer_mmap.c b/lib/ringbuffer/ring_buffer_mmap.c
index cf374348d907334f81e3f2d9b67ef8bce44789d2..8ff5e46afc5f21fe829853e94c29a0abb06a5666 100644 (file)
--- a/lib/ringbuffer/ring_buffer_mmap.c
+++ b/lib/ringbuffer/ring_buffer_mmap.c
@@ -24,7 +24,7 @@ static int lib_ring_buffer_fault(struct vm_area_struct *vma, struct vm_fault *vm
 {
        struct lib_ring_buffer *buf = vma->vm_private_data;
        struct channel *chan = buf->backend.chan;
-       const struct lib_ring_buffer_config *config = chan->backend.config;
+       const struct lib_ring_buffer_config *config = &chan->backend.config;
        pgoff_t pgoff = vmf->pgoff;
        struct page **page;
        void **virt;
@@ -74,15 +74,12 @@ static int lib_ring_buffer_mmap_buf(struct lib_ring_buffer *buf,
 {
        unsigned long length = vma->vm_end - vma->vm_start;
        struct channel *chan = buf->backend.chan;
-       const struct lib_ring_buffer_config *config = chan->backend.config;
+       const struct lib_ring_buffer_config *config = &chan->backend.config;
        unsigned long mmap_buf_len;
 
        if (config->output != RING_BUFFER_MMAP)
                return -EINVAL;
 
-       if (!buf)
-               return -EBADF;
-
        mmap_buf_len = chan->backend.buf_size;
        if (chan->backend.extra_reader_sb)
                mmap_buf_len += chan->backend.subbuf_size;