X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lib%2Fringbuffer%2Fbackend.h;h=3d2abd7750fc9874a0e5d04beba52aff378df028;hb=5760f3f4e64af16249a4f208e680c7dcffb4f990;hp=da937f29d6f8cc3c8954ca4be7361e9f7e003139;hpb=80bb26003945e96a8ade9c8788dab9b2e08cbc08;p=lttng-modules.git

diff --git a/lib/ringbuffer/backend.h b/lib/ringbuffer/backend.h
index da937f29..3d2abd77 100644
--- a/lib/ringbuffer/backend.h
+++ b/lib/ringbuffer/backend.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+/* SPDX-License-Identifier: (GPL-2.0-only OR LGPL-2.1-only)
  *
  * lib/ringbuffer/backend.h
  *
@@ -21,11 +21,11 @@
 #include <linux/list.h>
 #include <linux/fs.h>
 #include <linux/mm.h>
-#include <wrapper/uaccess.h>
+#include <linux/uaccess.h>
 
 /* Internal helpers */
-#include <wrapper/ringbuffer/backend_internal.h>
-#include <wrapper/ringbuffer/frontend_internal.h>
+#include <include/ringbuffer/backend_internal.h>
+#include <include/ringbuffer/frontend_internal.h>
 
 /* Ring buffer backend API */
 
@@ -289,7 +289,7 @@ void lib_ring_buffer_copy_from_user_inatomic(const struct lib_ring_buffer_config
 
 	set_fs(KERNEL_DS);
 	pagefault_disable();
-	if (unlikely(!lttng_access_ok(VERIFY_READ, src, len)))
+	if (unlikely(!access_ok(src, len)))
 		goto fill_buffer;
 
 	if (likely(pagecpy == len)) {
@@ -359,7 +359,7 @@ void lib_ring_buffer_strcpy_from_user_inatomic(const struct lib_ring_buffer_conf
 
 	set_fs(KERNEL_DS);
 	pagefault_disable();
-	if (unlikely(!lttng_access_ok(VERIFY_READ, src, len)))
+	if (unlikely(!access_ok(src, len)))
 		goto fill_buffer;
 
 	if (likely(pagecpy == len)) {
@@ -449,7 +449,7 @@ unsigned long lib_ring_buffer_copy_from_user_check_nofault(void *dest,
 	unsigned long ret;
 	mm_segment_t old_fs;
 
-	if (!lttng_access_ok(VERIFY_READ, src, len))
+	if (!access_ok(src, len))
 		return 1;
 	old_fs = get_fs();
 	set_fs(KERNEL_DS);