projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: pipe: stop using ->can_merge (v5.1)
[lttng-modules.git]
/
lib
/
ringbuffer
/
backend.h
diff --git
a/lib/ringbuffer/backend.h
b/lib/ringbuffer/backend.h
index 9db0095638973a2e0fb6da77affde9fb30bed8f5..3f8c108141521073c930661244ed376769cf137f 100644
(file)
--- a/
lib/ringbuffer/backend.h
+++ b/
lib/ringbuffer/backend.h
@@
-34,7
+34,7
@@
#include <linux/list.h>
#include <linux/fs.h>
#include <linux/mm.h>
#include <linux/list.h>
#include <linux/fs.h>
#include <linux/mm.h>
-#include <
linux
/uaccess.h>
+#include <
wrapper
/uaccess.h>
/* Internal helpers */
#include <wrapper/ringbuffer/backend_internal.h>
/* Internal helpers */
#include <wrapper/ringbuffer/backend_internal.h>
@@
-169,7
+169,7
@@
size_t lib_ring_buffer_do_strcpy(const struct lib_ring_buffer_config *config,
* Only read source character once, in case it is
* modified concurrently.
*/
* Only read source character once, in case it is
* modified concurrently.
*/
- c =
ACCESS
_ONCE(src[count]);
+ c =
READ
_ONCE(src[count]);
if (!c)
break;
lib_ring_buffer_do_copy(config, &dest[count], &c, 1);
if (!c)
break;
lib_ring_buffer_do_copy(config, &dest[count], &c, 1);
@@
-302,7
+302,7
@@
void lib_ring_buffer_copy_from_user_inatomic(const struct lib_ring_buffer_config
set_fs(KERNEL_DS);
pagefault_disable();
set_fs(KERNEL_DS);
pagefault_disable();
- if (unlikely(!access_ok(VERIFY_READ, src, len)))
+ if (unlikely(!
lttng_
access_ok(VERIFY_READ, src, len)))
goto fill_buffer;
if (likely(pagecpy == len)) {
goto fill_buffer;
if (likely(pagecpy == len)) {
@@
-372,7
+372,7
@@
void lib_ring_buffer_strcpy_from_user_inatomic(const struct lib_ring_buffer_conf
set_fs(KERNEL_DS);
pagefault_disable();
set_fs(KERNEL_DS);
pagefault_disable();
- if (unlikely(!access_ok(VERIFY_READ, src, len)))
+ if (unlikely(!
lttng_
access_ok(VERIFY_READ, src, len)))
goto fill_buffer;
if (likely(pagecpy == len)) {
goto fill_buffer;
if (likely(pagecpy == len)) {
@@
-462,7
+462,7
@@
unsigned long lib_ring_buffer_copy_from_user_check_nofault(void *dest,
unsigned long ret;
mm_segment_t old_fs;
unsigned long ret;
mm_segment_t old_fs;
- if (!access_ok(VERIFY_READ, src, len))
+ if (!
lttng_
access_ok(VERIFY_READ, src, len))
return 1;
old_fs = get_fs();
set_fs(KERNEL_DS);
return 1;
old_fs = get_fs();
set_fs(KERNEL_DS);
This page took
0.026987 seconds
and
4
git commands to generate.