X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lib%2Fringbuffer%2Fbackend.h;h=46dcf1ccd9053443c4d00a743f5e1d19b2aa9ddb;hb=6423140ffcb1c5b005199bb2fa34621361ad538d;hp=d811911020d10f0b9d32e9cfaa3ce18a4ad0ae70;hpb=30cddf693eea0129b25c9761db6b202ddef549b3;p=lttng-modules.git

diff --git a/lib/ringbuffer/backend.h b/lib/ringbuffer/backend.h
index d8119110..46dcf1cc 100644
--- a/lib/ringbuffer/backend.h
+++ b/lib/ringbuffer/backend.h
@@ -22,6 +22,7 @@
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <wrapper/uaccess.h>
+#include <probes/lttng-probe-user.h>
 
 /* Internal helpers */
 #include <wrapper/ringbuffer/backend_internal.h>
@@ -313,7 +314,7 @@ fill_buffer:
 	 * the pollution of static inline code.
 	 */
 	_lib_ring_buffer_memset(bufb, offset, 0, len, 0);
-	ctx->priv.buf_offset += len;
+	ctx->buf_offset += len;
 }
 
 /**
@@ -396,7 +397,7 @@ fill_buffer:
 	_lib_ring_buffer_memset(bufb, offset, pad, len - 1, 0);
 	offset += len - 1;
 	_lib_ring_buffer_memset(bufb, offset, '\0', 1, 0);
-	ctx->priv.buf_offset += len;
+	ctx->buf_offset += len;
 }
 
 /*
@@ -440,14 +441,7 @@ unsigned long lib_ring_buffer_copy_from_user_check_nofault(void *dest,
 						const void __user *src,
 						unsigned long len)
 {
-	unsigned long ret;
-
-	if (!lttng_access_ok(VERIFY_READ, src, len))
-		return 1;
-	pagefault_disable();
-	ret = __copy_from_user_inatomic(dest, src, len);
-	pagefault_enable();
-	return ret;
+	return lttng_copy_from_user_check_nofault(dest, src, len);
 }
 
 #endif /* _LIB_RING_BUFFER_BACKEND_H */