instrumentation: jbd: remove deprecated probe

[lttng-modules.git] / lib / ringbuffer / ring_buffer_splice.c

diff --git a/lib/ringbuffer/ring_buffer_splice.c b/lib/ringbuffer/ring_buffer_splice.c
index 8d146667d41c0327c5a5847965fd77bc7ccc2f23..9695b9fe9464f3f047f216681832b62764b0cb9f 100644 (file)
--- a/lib/ringbuffer/ring_buffer_splice.c
+++ b/lib/ringbuffer/ring_buffer_splice.c
@@ -1,33 +1,20 @@
-/*
+/* SPDX-License-Identifier: GPL-2.0-only
+ *
  * 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 <linux/splice.h>
 
-#include <wrapper/splice.h>
 #include <wrapper/ringbuffer/backend.h>
 #include <wrapper/ringbuffer/frontend.h>
 #include <wrapper/ringbuffer/vfs.h>
@@ -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,
@@ -163,7 +152,7 @@ static int subbuf_splice_actor(struct file *in,
        if (!spd.nr_pages)
                return 0;
 
-       return wrapper_splice_to_pipe(pipe, &spd);
+       return splice_to_pipe(pipe, &spd);
 }
 
 ssize_t lib_ring_buffer_splice_read(struct file *in, loff_t *ppos,