lkml.org 
[lkml]   [2023]   [May]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v21 13/30] net: Make sock_splice_read() use copy_splice_read() by default
    Date
    Make sock_splice_read() use copy_splice_read() by default as
    file_splice_read() will return immediately with 0 as a socket has no
    pagecache and is a zero-size file.

    Signed-off-by: David Howells <dhowells@redhat.com>
    cc: "David S. Miller" <davem@davemloft.net>
    cc: Eric Dumazet <edumazet@google.com>
    cc: Jakub Kicinski <kuba@kernel.org>
    cc: Paolo Abeni <pabeni@redhat.com>
    cc: Christoph Hellwig <hch@lst.de>
    cc: Al Viro <viro@zeniv.linux.org.uk>
    cc: Jens Axboe <axboe@kernel.dk>
    cc: netdev@vger.kernel.org
    cc: linux-block@vger.kernel.org
    cc: linux-mm@kvack.org
    ---
    net/socket.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/net/socket.c b/net/socket.c
    index b7e01d0fe082..401778380195 100644
    --- a/net/socket.c
    +++ b/net/socket.c
    @@ -1093,7 +1093,7 @@ static ssize_t sock_splice_read(struct file *file, loff_t *ppos,
    struct socket *sock = file->private_data;

    if (unlikely(!sock->ops->splice_read))
    - return generic_file_splice_read(file, ppos, pipe, len, flags);
    + return copy_splice_read(file, ppos, pipe, len, flags);

    return sock->ops->splice_read(sock, ppos, pipe, len, flags);
    }
    \
     
     \ /
      Last update: 2023-05-20 02:04    [W:4.441 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site