X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lib%2Fringbuffer%2Fring_buffer_splice.c;h=52179a79986597f24352a5177f14cebfb02f0a9d;hb=812026fcebce14e489749c44ad601a072588e51b;hp=bb91f45e01a303303b514814436d388ed9292c23;hpb=989f58e80ffdf6fbc3150d14977c2bff411d3b9c;p=lttng-modules.git

diff --git a/lib/ringbuffer/ring_buffer_splice.c b/lib/ringbuffer/ring_buffer_splice.c
index bb91f45e..52179a79 100644
--- a/lib/ringbuffer/ring_buffer_splice.c
+++ b/lib/ringbuffer/ring_buffer_splice.c
@@ -1,36 +1,23 @@
-/*
+/* SPDX-License-Identifier: GPL-2.0
+ *
  * ring_buffer_splice.c
  *
  * Copyright (C) 2002-2005 - Tom Zanussi <zanussi@us.ibm.com>, IBM Corp
  * Copyright (C) 1999-2005 - Karim Yaghmour <karim@opersys.com>
  * Copyright (C) 2008-2012 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  * Re-using code from kernel/relay.c, which is why it is licensed under
- * the GPLv2.
+ * the GPL-2.0.
  */
 
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/version.h>
 
-#include "../../wrapper/splice.h"
-#include "../../wrapper/ringbuffer/backend.h"
-#include "../../wrapper/ringbuffer/frontend.h"
-#include "../../wrapper/ringbuffer/vfs.h"
+#include <wrapper/splice.h>
+#include <wrapper/ringbuffer/backend.h>
+#include <wrapper/ringbuffer/frontend.h>
+#include <wrapper/ringbuffer/vfs.h>
 
 #if 0
 #define printk_dbg(fmt, args...) printk(fmt, args)
@@ -56,7 +43,9 @@ static void lib_ring_buffer_pipe_buf_release(struct pipe_inode_info *pipe,
 }
 
 static const struct pipe_buf_operations ring_buffer_pipe_buf_ops = {
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,1,0))
 	.can_merge = 0,
+#endif
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0))
 	.map = generic_pipe_buf_map,
 	.unmap = generic_pipe_buf_unmap,
@@ -95,7 +84,9 @@ static int subbuf_splice_actor(struct file *in,
 		.pages = pages,
 		.nr_pages = 0,
 		.partial = partial,
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0))
 		.flags = flags,
+#endif
 		.ops = &ring_buffer_pipe_buf_ops,
 		.spd_release = lib_ring_buffer_page_release,
 	};
@@ -126,7 +117,8 @@ static int subbuf_splice_actor(struct file *in,
 
 	for (; spd.nr_pages < nr_pages; spd.nr_pages++) {
 		unsigned int this_len;
-		struct page **page, *new_page;
+		unsigned long *pfnp, new_pfn;
+		struct page *new_page;
 		void **virt;
 
 		if (!len)
@@ -143,11 +135,11 @@ static int subbuf_splice_actor(struct file *in,
 					    GFP_KERNEL | __GFP_ZERO, 0);
 		if (!new_page)
 			break;
-
+		new_pfn = page_to_pfn(new_page);
 		this_len = PAGE_SIZE - poff;
-		page = lib_ring_buffer_read_get_page(&buf->backend, roffset, &virt);
-		spd.pages[spd.nr_pages] = *page;
-		*page = new_page;
+		pfnp = lib_ring_buffer_read_get_pfn(&buf->backend, roffset, &virt);
+		spd.pages[spd.nr_pages] = pfn_to_page(*pfnp);
+		*pfnp = new_pfn;
 		*virt = page_address(new_page);
 		spd.partial[spd.nr_pages].offset = poff;
 		spd.partial[spd.nr_pages].len = this_len;