aboutsummaryrefslogtreecommitdiffstats
path: root/net/unix/af_unix.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/unix/af_unix.c')
-rw-r--r--net/unix/af_unix.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 8309687a56b0..145082e2ba36 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -2475,28 +2475,13 @@ static int unix_stream_recvmsg(struct socket *sock, struct msghdr *msg,
2475 return unix_stream_read_generic(&state); 2475 return unix_stream_read_generic(&state);
2476} 2476}
2477 2477
2478static ssize_t skb_unix_socket_splice(struct sock *sk,
2479 struct pipe_inode_info *pipe,
2480 struct splice_pipe_desc *spd)
2481{
2482 int ret;
2483 struct unix_sock *u = unix_sk(sk);
2484
2485 mutex_unlock(&u->iolock);
2486 ret = splice_to_pipe(pipe, spd);
2487 mutex_lock(&u->iolock);
2488
2489 return ret;
2490}
2491
2492static int unix_stream_splice_actor(struct sk_buff *skb, 2478static int unix_stream_splice_actor(struct sk_buff *skb,
2493 int skip, int chunk, 2479 int skip, int chunk,
2494 struct unix_stream_read_state *state) 2480 struct unix_stream_read_state *state)
2495{ 2481{
2496 return skb_splice_bits(skb, state->socket->sk, 2482 return skb_splice_bits(skb, state->socket->sk,
2497 UNIXCB(skb).consumed + skip, 2483 UNIXCB(skb).consumed + skip,
2498 state->pipe, chunk, state->splice_flags, 2484 state->pipe, chunk, state->splice_flags);
2499 skb_unix_socket_splice);
2500} 2485}
2501 2486
2502static ssize_t unix_stream_splice_read(struct socket *sock, loff_t *ppos, 2487static ssize_t unix_stream_splice_read(struct socket *sock, loff_t *ppos,