[PATCH 49/56] net/socket: support compiling out splice
From: Pieter Smith <hidden>
Date: 2014-11-13 21:31:33
Also in:
lkml
Subsystem:
networking [general], networking [sockets], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Kuniyuki Iwashima, Willem de Bruijn, Linus Torvalds
Compile out splice support from socket when the splice-family of syscalls is not supported by the system (i.e. CONFIG_SYSCALL_SPLICE is undefined). Signed-off-by: Pieter Smith <redacted> --- net/socket.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/net/socket.c b/net/socket.c
index 95ee7d8..5cb347a 100644
--- a/net/socket.c
+++ b/net/socket.c@@ -155,8 +155,8 @@ static const struct file_operations socket_file_ops = { .release = sock_close, .fasync = sock_fasync, .sendpage = sock_sendpage, - .splice_write = generic_splice_sendpage, - .splice_read = sock_splice_read, + SPLICE_WRITE_INIT(generic_splice_sendpage) + SPLICE_READ_INIT(sock_splice_read) }; /*
@@ -881,7 +881,8 @@ static ssize_t sock_sendpage(struct file *file, struct page *page, return kernel_sendpage(sock, page, offset, size, flags); } -static ssize_t sock_splice_read(struct file *file, loff_t *ppos, +static ssize_t __maybe_unused sock_splice_read( + struct file *file, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, unsigned int flags) {
--
1.9.1