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>

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;