net: make spd_fill_page() linear argument a bool
authorEric Dumazet <edumazet@google.com>
Tue, 24 Apr 2012 03:35:04 +0000 (23:35 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 24 Apr 2012 03:35:04 +0000 (23:35 -0400)
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/skbuff.c

index aaf4abc..2342a72 100644 (file)
@@ -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,
                          struct pipe_inode_info *pipe, struct page *page,
                          unsigned int *len, unsigned int offset,
-                         struct sk_buff *skb, int linear,
+                         struct sk_buff *skb, bool linear,
                          struct sock *sk)
 {
        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,
                             unsigned int plen, unsigned int *off,
                             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 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),
                             (unsigned long) skb->data & (PAGE_SIZE - 1),
                             skb_headlen(skb),
-                            offset, len, skb, spd, 1, sk, pipe))
+                            offset, len, skb, spd, true, sk, pipe))
                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),
                                     f->page_offset, skb_frag_size(f),
-                                    offset, len, skb, spd, 0, sk, pipe))
+                                    offset, len, skb, spd, false, sk, pipe))
                        return true;
        }