From ab257937db6125ed348885d3ba8c43b2d7a04e7a Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 13 Apr 2020 17:00:11 -0400 Subject: [PATCH] ring buffer splice: remove compatibility code --- lib/ringbuffer/ring_buffer_splice.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/lib/ringbuffer/ring_buffer_splice.c b/lib/ringbuffer/ring_buffer_splice.c index 9695b9fe..1888e0f8 100644 --- a/lib/ringbuffer/ring_buffer_splice.c +++ b/lib/ringbuffer/ring_buffer_splice.c @@ -12,7 +12,6 @@ #include #include -#include #include #include @@ -43,13 +42,6 @@ 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, -#endif .confirm = generic_pipe_buf_confirm, .release = lib_ring_buffer_pipe_buf_release, .steal = generic_pipe_buf_steal, @@ -84,9 +76,6 @@ 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, }; -- 2.34.1