X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libringbuffer%2Fbackend.h;h=61d2f3277f3192765b14b51f8175d40e1b8a8d42;hb=14641debd03ba299bd06040cb62e0dbdef7fac81;hp=b50bae1a1f0ca4323fe30a9f73a9204317199589;hpb=4b4de73e56cad17f87de69bd9386389ed69c0a12;p=lttng-ust.git

diff --git a/libringbuffer/backend.h b/libringbuffer/backend.h
index b50bae1a..61d2f327 100644
--- a/libringbuffer/backend.h
+++ b/libringbuffer/backend.h
@@ -14,6 +14,10 @@
  * the reader in flight recorder mode.
  */
 
+#include <unistd.h>
+
+#include "ust/core.h"
+
 /* Internal helpers */
 #include "backend_internal.h"
 #include "frontend_internal.h"
@@ -25,10 +29,6 @@
 extern size_t lib_ring_buffer_read(struct lib_ring_buffer_backend *bufb,
 				   size_t offset, void *dest, size_t len);
 
-extern int __lib_ring_buffer_copy_to_user(struct lib_ring_buffer_backend *bufb,
-					  size_t offset, void __user *dest,
-					  size_t len);
-
 extern int lib_ring_buffer_read_cstr(struct lib_ring_buffer_backend *bufb,
 				     size_t offset, void *dest, size_t len);
 
@@ -76,7 +76,7 @@ void lib_ring_buffer_write(const struct lib_ring_buffer_config *config,
 
 	offset &= chanb->buf_size - 1;
 	sbidx = offset >> chanb->subbuf_size_order;
-	index = (offset & (chanb->subbuf_size - 1)) >> PAGE_SHIFT;
+	index = (offset & (chanb->subbuf_size - 1)) >> get_count_order(PAGE_SIZE);
 	pagecpy = min_t(size_t, len, (-offset) & ~PAGE_MASK);
 	id = bufb->buf_wsb[sbidx].id;
 	sb_bindex = subbuffer_id_get_index(config, id);
@@ -124,9 +124,4 @@ unsigned long lib_ring_buffer_get_records_unread(
 	return records_unread;
 }
 
-ssize_t lib_ring_buffer_file_splice_read(struct file *in, loff_t *ppos,
-					 struct pipe_inode_info *pipe,
-					 size_t len, unsigned int flags);
-loff_t lib_ring_buffer_no_llseek(struct file *file, loff_t offset, int origin);
-
 #endif /* _LINUX_RING_BUFFER_BACKEND_H */