|
@@ -1601,7 +1601,7 @@ static bool spd_can_coalesce(const struct splice_pipe_desc *spd,
|
|
static bool spd_fill_page(struct splice_pipe_desc *spd,
|
|
static bool spd_fill_page(struct splice_pipe_desc *spd,
|
|
struct pipe_inode_info *pipe, struct page *page,
|
|
struct pipe_inode_info *pipe, struct page *page,
|
|
unsigned int *len, unsigned int offset,
|
|
unsigned int *len, unsigned int offset,
|
|
- struct sk_buff *skb, int linear,
|
|
|
|
|
|
+ struct sk_buff *skb, bool linear,
|
|
struct sock *sk)
|
|
struct sock *sk)
|
|
{
|
|
{
|
|
if (unlikely(spd->nr_pages == MAX_SKB_FRAGS))
|
|
if (unlikely(spd->nr_pages == MAX_SKB_FRAGS))
|
|
@@ -1642,7 +1642,7 @@ static inline void __segment_seek(struct page **page, unsigned int *poff,
|
|
static bool __splice_segment(struct page *page, unsigned int poff,
|
|
static bool __splice_segment(struct page *page, unsigned int poff,
|
|
unsigned int plen, unsigned int *off,
|
|
unsigned int plen, unsigned int *off,
|
|
unsigned int *len, struct sk_buff *skb,
|
|
unsigned int *len, struct sk_buff *skb,
|
|
- struct splice_pipe_desc *spd, int linear,
|
|
|
|
|
|
+ struct splice_pipe_desc *spd, bool linear,
|
|
struct sock *sk,
|
|
struct sock *sk,
|
|
struct pipe_inode_info *pipe)
|
|
struct pipe_inode_info *pipe)
|
|
{
|
|
{
|
|
@@ -1694,7 +1694,7 @@ static bool __skb_splice_bits(struct sk_buff *skb, struct pipe_inode_info *pipe,
|
|
if (__splice_segment(virt_to_page(skb->data),
|
|
if (__splice_segment(virt_to_page(skb->data),
|
|
(unsigned long) skb->data & (PAGE_SIZE - 1),
|
|
(unsigned long) skb->data & (PAGE_SIZE - 1),
|
|
skb_headlen(skb),
|
|
skb_headlen(skb),
|
|
- offset, len, skb, spd, 1, sk, pipe))
|
|
|
|
|
|
+ offset, len, skb, spd, true, sk, pipe))
|
|
return true;
|
|
return true;
|
|
|
|
|
|
/*
|
|
/*
|
|
@@ -1705,7 +1705,7 @@ static bool __skb_splice_bits(struct sk_buff *skb, struct pipe_inode_info *pipe,
|
|
|
|
|
|
if (__splice_segment(skb_frag_page(f),
|
|
if (__splice_segment(skb_frag_page(f),
|
|
f->page_offset, skb_frag_size(f),
|
|
f->page_offset, skb_frag_size(f),
|
|
- offset, len, skb, spd, 0, sk, pipe))
|
|
|
|
|
|
+ offset, len, skb, spd, false, sk, pipe))
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
|
|
|