Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / net / core / skbuff.c

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index cbd19d2..1e3e008 100644 (file)
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -1962,37 +1962,13 @@ static bool __skb_splice_bits(struct sk_buff *skb, struct pipe_inode_info *pipe,
        return false;
 }
 
-ssize_t skb_socket_splice(struct sock *sk,
-                         struct pipe_inode_info *pipe,
-                         struct splice_pipe_desc *spd)
-{
-       int ret;
-
-       /* Drop the socket lock, otherwise we have reverse
-        * locking dependencies between sk_lock and i_mutex
-        * here as compared to sendfile(). We enter here
-        * with the socket lock held, and splice_to_pipe() will
-        * grab the pipe inode lock. For sendfile() emulation,
-        * we call into ->sendpage() with the i_mutex lock held
-        * and networking will grab the socket lock.
-        */
-       release_sock(sk);
-       ret = splice_to_pipe(pipe, spd);
-       lock_sock(sk);
-
-       return ret;
-}
-
 /*
  * Map data from the skb to a pipe. Should handle both the linear part,
  * the fragments, and the frag list.
  */
 int skb_splice_bits(struct sk_buff *skb, struct sock *sk, unsigned int offset,
                    struct pipe_inode_info *pipe, unsigned int tlen,
-                   unsigned int flags,
-                   ssize_t (*splice_cb)(struct sock *,
-                                        struct pipe_inode_info *,
-                                        struct splice_pipe_desc *))
+                   unsigned int flags)
 {
        struct partial_page partial[MAX_SKB_FRAGS];
        struct page *pages[MAX_SKB_FRAGS];
@@ -2009,7 +1985,7 @@ int skb_splice_bits(struct sk_buff *skb, struct sock *sk, unsigned int offset,
        __skb_splice_bits(skb, pipe, &offset, &tlen, &spd, sk);
 
        if (spd.nr_pages)
-               ret = splice_cb(sk, pipe, &spd);
+               ret = splice_to_pipe(pipe, &spd);
 
        return ret;
 }