Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a108d5f3 authored by David S. Miller's avatar David S. Miller
Browse files

net: Use bool and remove inline in skb_splice_bits() code. 



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 41c73a0d

net/core/skbuff.c

+29 −29
Original line number Original line Diff line number Diff line
@@ -1547,7 +1547,7 @@ static void sock_spd_release(struct splice_pipe_desc *spd, unsigned int i) 
	put_page(spd->pages[i]);

	put_page(spd->pages[i]);

}

}





static inline struct page *linear_to_page(struct page *page, unsigned int *len,

static struct page *linear_to_page(struct page *page, unsigned int *len,

				   unsigned int *offset,

				   unsigned int *offset,

				   struct sk_buff *skb, struct sock *sk)

				   struct sk_buff *skb, struct sock *sk)

{

{
@@ -1598,23 +1598,23 @@ static bool spd_can_coalesce(const struct splice_pipe_desc *spd, 
/*

/*

 * Fill page/offset/length into spd, if it can hold more pages.

 * Fill page/offset/length into spd, if it can hold more pages.

 */

 */

static inline int 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, int linear,

			  struct sock *sk)

			  struct sock *sk)

{

{

	if (unlikely(spd->nr_pages == MAX_SKB_FRAGS))

	if (unlikely(spd->nr_pages == MAX_SKB_FRAGS))

		return 1;

		return true;





	if (linear) {

	if (linear) {

		page = linear_to_page(page, len, &offset, skb, sk);

		page = linear_to_page(page, len, &offset, skb, sk);

		if (!page)

		if (!page)

			return 1;

			return true;

	}

	}

	if (spd_can_coalesce(spd, page, offset)) {

	if (spd_can_coalesce(spd, page, offset)) {

		spd->partial[spd->nr_pages - 1].len += *len;

		spd->partial[spd->nr_pages - 1].len += *len;

		return 0;

		return false;

	}

	}

	get_page(page);

	get_page(page);

	spd->pages[spd->nr_pages] = page;

	spd->pages[spd->nr_pages] = page;
@@ -1622,7 +1622,7 @@ static inline int spd_fill_page(struct splice_pipe_desc *spd, 
	spd->partial[spd->nr_pages].offset = offset;

	spd->partial[spd->nr_pages].offset = offset;

	spd->nr_pages++;

	spd->nr_pages++;





	return 0;

	return false;

}

}





static inline void __segment_seek(struct page **page, unsigned int *poff,

static inline void __segment_seek(struct page **page, unsigned int *poff,
@@ -1639,7 +1639,7 @@ static inline void __segment_seek(struct page **page, unsigned int *poff, 
	*plen -= off;

	*plen -= off;

}

}





static inline int __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, int linear,
@@ -1647,12 +1647,12 @@ static inline int __splice_segment(struct page *page, unsigned int poff, 
			     struct pipe_inode_info *pipe)

			     struct pipe_inode_info *pipe)

{

{

	if (!*len)

	if (!*len)

		return 1;

		return true;





	/* skip this segment if already processed */

	/* skip this segment if already processed */

	if (*off >= plen) {

	if (*off >= plen) {

		*off -= plen;

		*off -= plen;

		return 0;

		return false;

	}

	}





	/* ignore any bits we already processed */

	/* ignore any bits we already processed */
@@ -1668,21 +1668,21 @@ static inline int __splice_segment(struct page *page, unsigned int poff, 
		flen = min_t(unsigned int, flen, PAGE_SIZE - poff);

		flen = min_t(unsigned int, flen, PAGE_SIZE - poff);





		if (spd_fill_page(spd, pipe, page, &flen, poff, skb, linear, sk))

		if (spd_fill_page(spd, pipe, page, &flen, poff, skb, linear, sk))

			return 1;

			return true;





		__segment_seek(&page, &poff, &plen, flen);

		__segment_seek(&page, &poff, &plen, flen);

		*len -= flen;

		*len -= flen;





	} while (*len && plen);

	} while (*len && plen);





	return 0;

	return false;

}

}





/*

/*

 * Map linear and fragment data from the skb to spd. It reports failure if the

 * Map linear and fragment data from the skb to spd. It reports true if the

 * pipe is full or if we already spliced the requested length.

 * pipe is full or if we already spliced the requested length.

 */

 */

static int __skb_splice_bits(struct sk_buff *skb, struct pipe_inode_info *pipe,

static bool __skb_splice_bits(struct sk_buff *skb, struct pipe_inode_info *pipe,

			      unsigned int *offset, unsigned int *len,

			      unsigned int *offset, unsigned int *len,

			      struct splice_pipe_desc *spd, struct sock *sk)

			      struct splice_pipe_desc *spd, struct sock *sk)

{

{
@@ -1695,7 +1695,7 @@ static int __skb_splice_bits(struct sk_buff *skb, struct pipe_inode_info *pipe, 
			     (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, 1, sk, pipe))

		return 1;

		return true;





	/*

	/*

	 * then map the fragments

	 * then map the fragments
@@ -1706,10 +1706,10 @@ static int __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, 0, sk, pipe))

			return 1;

			return true;

	}

	}





	return 0;

	return false;

}

}





/*

/*