aboutsummaryrefslogtreecommitdiffstats
path: root/net/kcm
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-09-17 21:02:10 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2016-10-03 20:40:56 -0400
commit25869262ef7af24ccde988867ac3eb1c3d4b88d4 (patch)
treeb625a7350e316e4fe2033e5689fb0bbc6b3e2973 /net/kcm
parentnew helper: add_to_pipe() (diff)
downloadlinux-dev-25869262ef7af24ccde988867ac3eb1c3d4b88d4.tar.xz
linux-dev-25869262ef7af24ccde988867ac3eb1c3d4b88d4.zip
skb_splice_bits(): get rid of callback
since pipe_lock is the outermost now, we don't need to drop/regain socket locks around the call of splice_to_pipe() from skb_splice_bits(), which kills the need to have a socket-specific callback; we can just call splice_to_pipe() and be done with that. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/kcm')
-rw-r--r--net/kcm/kcmsock.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c
index 411693288648..8a720ba50061 100644
--- a/net/kcm/kcmsock.c
+++ b/net/kcm/kcmsock.c
@@ -1462,19 +1462,6 @@ out:
return copied ? : err;
}
-static ssize_t kcm_sock_splice(struct sock *sk,
- struct pipe_inode_info *pipe,
- struct splice_pipe_desc *spd)
-{
- int ret;
-
- release_sock(sk);
- ret = splice_to_pipe(pipe, spd);
- lock_sock(sk);
-
- return ret;
-}
-
static ssize_t kcm_splice_read(struct socket *sock, loff_t *ppos,
struct pipe_inode_info *pipe, size_t len,
unsigned int flags)
@@ -1504,8 +1491,7 @@ static ssize_t kcm_splice_read(struct socket *sock, loff_t *ppos,
if (len > rxm->full_len)
len = rxm->full_len;
- copied = skb_splice_bits(skb, sk, rxm->offset, pipe, len, flags,
- kcm_sock_splice);
+ copied = skb_splice_bits(skb, sk, rxm->offset, pipe, len, flags);
if (copied < 0) {
err = copied;
goto err_out;