X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Fringbuffer%2Fbackend.h;h=a975c7ec429ca075abdc96670ef944e53b197144;hb=484ec2179e14ae9272a7ad3d1820c837136fd144;hp=1f499c90a25804a9dc131690eba4397af3489377;hpb=2459130397d7e7eecc44a5f06a39d65c78257eef;p=lttng-modules.git

diff --git a/include/ringbuffer/backend.h b/include/ringbuffer/backend.h
index 1f499c90..a975c7ec 100644
--- a/include/ringbuffer/backend.h
+++ b/include/ringbuffer/backend.h
@@ -156,7 +156,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.
 		 */
-		c = READ_ONCE(src[count]);
+		c = LTTNG_READ_ONCE(src[count]);
 		if (!c)
 			break;
 		lib_ring_buffer_do_copy(config, &dest[count], &c, 1);
@@ -277,7 +277,6 @@ void lib_ring_buffer_copy_from_user_inatomic(const struct lib_ring_buffer_config
 	size_t offset = ctx->buf_offset;
 	struct lib_ring_buffer_backend_pages *backend_pages;
 	unsigned long ret;
-	mm_segment_t old_fs = get_fs();
 
 	if (unlikely(!len))
 		return;
@@ -287,7 +286,6 @@ void lib_ring_buffer_copy_from_user_inatomic(const struct lib_ring_buffer_config
 	index = (offset & (chanb->subbuf_size - 1)) >> PAGE_SHIFT;
 	pagecpy = min_t(size_t, len, (-offset) & ~PAGE_MASK);
 
-	set_fs(KERNEL_DS);
 	pagefault_disable();
 	if (unlikely(!lttng_access_ok(VERIFY_READ, src, len)))
 		goto fill_buffer;
@@ -304,14 +302,12 @@ void lib_ring_buffer_copy_from_user_inatomic(const struct lib_ring_buffer_config
 		_lib_ring_buffer_copy_from_user_inatomic(bufb, offset, src, len, 0);
 	}
 	pagefault_enable();
-	set_fs(old_fs);
 	ctx->buf_offset += len;
 
 	return;
 
 fill_buffer:
 	pagefault_enable();
-	set_fs(old_fs);
 	/*
 	 * In the error path we call the slow path version to avoid
 	 * the pollution of static inline code.
@@ -347,7 +343,6 @@ void lib_ring_buffer_strcpy_from_user_inatomic(const struct lib_ring_buffer_conf
 	size_t index, pagecpy;
 	size_t offset = ctx->buf_offset;
 	struct lib_ring_buffer_backend_pages *backend_pages;
-	mm_segment_t old_fs = get_fs();
 
 	if (unlikely(!len))
 		return;
@@ -357,7 +352,6 @@ void lib_ring_buffer_strcpy_from_user_inatomic(const struct lib_ring_buffer_conf
 	index = (offset & (chanb->subbuf_size - 1)) >> PAGE_SHIFT;
 	pagecpy = min_t(size_t, len, (-offset) & ~PAGE_MASK);
 
-	set_fs(KERNEL_DS);
 	pagefault_disable();
 	if (unlikely(!lttng_access_ok(VERIFY_READ, src, len)))
 		goto fill_buffer;
@@ -388,14 +382,12 @@ void lib_ring_buffer_strcpy_from_user_inatomic(const struct lib_ring_buffer_conf
 					len, 0, pad);
 	}
 	pagefault_enable();
-	set_fs(old_fs);
 	ctx->buf_offset += len;
 
 	return;
 
 fill_buffer:
 	pagefault_enable();
-	set_fs(old_fs);
 	/*
 	 * In the error path we call the slow path version to avoid
 	 * the pollution of static inline code.
@@ -447,16 +439,12 @@ unsigned long lib_ring_buffer_copy_from_user_check_nofault(void *dest,
 						unsigned long len)
 {
 	unsigned long ret;
-	mm_segment_t old_fs;
 
 	if (!lttng_access_ok(VERIFY_READ, src, len))
 		return 1;
-	old_fs = get_fs();
-	set_fs(KERNEL_DS);
 	pagefault_disable();
 	ret = __copy_from_user_inatomic(dest, src, len);
 	pagefault_enable();
-	set_fs(old_fs);
 	return ret;
 }