From 635319ac6cd462914d47eb27559b53f872492dd8 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 30 Nov 2011 13:34:16 -0500 Subject: [PATCH] --- yaml --- r: 281219 b: refs/heads/master c: eeb34e2113576aea782094d1e30f22b445355fe8 h: refs/heads/master i: 281217: 1f9a8e9df0e1d18abb420276e3f114b9b2d27b9d 281215: 6931a6066d7f27f7787f3fdc4b0e604854de8ece v: v3 --- [refs] | 2 +- trunk/drivers/staging/lttng/lib/ringbuffer/ring_buffer_mmap.c | 3 --- trunk/drivers/staging/lttng/lib/ringbuffer/ring_buffer_vfs.c | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1c04481014f9..18ad3f59daa1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5f7787388da7562b955a36b46e909e500a5974b +refs/heads/master: eeb34e2113576aea782094d1e30f22b445355fe8 diff --git a/trunk/drivers/staging/lttng/lib/ringbuffer/ring_buffer_mmap.c b/trunk/drivers/staging/lttng/lib/ringbuffer/ring_buffer_mmap.c index cf374348d907..c9d6e89a7695 100644 --- a/trunk/drivers/staging/lttng/lib/ringbuffer/ring_buffer_mmap.c +++ b/trunk/drivers/staging/lttng/lib/ringbuffer/ring_buffer_mmap.c @@ -80,9 +80,6 @@ static int lib_ring_buffer_mmap_buf(struct lib_ring_buffer *buf, 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; diff --git a/trunk/drivers/staging/lttng/lib/ringbuffer/ring_buffer_vfs.c b/trunk/drivers/staging/lttng/lib/ringbuffer/ring_buffer_vfs.c index 1708ffd6bc9b..8b783052a5f6 100644 --- a/trunk/drivers/staging/lttng/lib/ringbuffer/ring_buffer_vfs.c +++ b/trunk/drivers/staging/lttng/lib/ringbuffer/ring_buffer_vfs.c @@ -42,6 +42,9 @@ int lib_ring_buffer_open(struct inode *inode, struct file *file) struct lib_ring_buffer *buf = inode->i_private; int ret; + if (!buf) + return -EINVAL; + ret = lib_ring_buffer_open_read(buf); if (ret) return ret;