projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Remove 'type' argument from access_ok() function (v5.0)
[lttng-modules.git]
/
lib
/
ringbuffer
/
ring_buffer_iterator.c
diff --git
a/lib/ringbuffer/ring_buffer_iterator.c
b/lib/ringbuffer/ring_buffer_iterator.c
index b6bec48d0dfc94e0dd5c3d7337ce0f1d17bd12ae..96459469f242e696ffd3645ce97a237608cabd74 100644
(file)
--- a/
lib/ringbuffer/ring_buffer_iterator.c
+++ b/
lib/ringbuffer/ring_buffer_iterator.c
@@
-27,6
+27,7
@@
#include <wrapper/ringbuffer/iterator.h>
#include <wrapper/file.h>
#include <wrapper/ringbuffer/iterator.h>
#include <wrapper/file.h>
+#include <wrapper/uaccess.h>
#include <linux/jiffies.h>
#include <linux/delay.h>
#include <linux/module.h>
#include <linux/jiffies.h>
#include <linux/delay.h>
#include <linux/module.h>
@@
-61,7
+62,7
@@
restart:
switch (iter->state) {
case ITER_GET_SUBBUF:
ret = lib_ring_buffer_get_next_subbuf(buf);
switch (iter->state) {
case ITER_GET_SUBBUF:
ret = lib_ring_buffer_get_next_subbuf(buf);
- if (ret && !
ACCESS
_ONCE(buf->finalized)
+ if (ret && !
READ
_ONCE(buf->finalized)
&& config->alloc == RING_BUFFER_ALLOC_GLOBAL) {
/*
* Use "pull" scheme for global buffers. The reader
&& config->alloc == RING_BUFFER_ALLOC_GLOBAL) {
/*
* Use "pull" scheme for global buffers. The reader
@@
-621,7
+622,7
@@
ssize_t channel_ring_buffer_file_read(struct file *filp,
ssize_t len;
might_sleep();
ssize_t len;
might_sleep();
- if (!access_ok(VERIFY_WRITE, user_buf, count))
+ if (!
lttng_
access_ok(VERIFY_WRITE, user_buf, count))
return -EFAULT;
/* Finish copy of previous record */
return -EFAULT;
/* Finish copy of previous record */
This page took
0.023342 seconds
and
4
git commands to generate.