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

Commit df97c708 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[NET]: Eliminate unused argument from sk_stream_alloc_pskb 



The 3rd argument is always zero (according to grep :) Eliminate
it and merge the function with sk_stream_alloc_skb.

This saves 44 more bytes, and together with the previous patch
we have:

add/remove: 1/0 grow/shrink: 0/8 up/down: 183/-751 (-568)
function                                     old     new   delta
sk_stream_alloc_skb                            -     183    +183
ip_rt_init                                   529     525      -4
arp_ignore                                   112     107      -5
__inet_lookup_listener                       284     274     -10
tcp_sendmsg                                 2583    2481    -102
tcp_sendpage                                1449    1300    -149
tso_fragment                                 417     258    -159
tcp_fragment                                1149     988    -161
__tcp_push_pending_frames                   1998    1837    -161

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f561d0f2

include/net/sock.h

+1 −9
Original line number Diff line number Diff line
@@ -1192,15 +1192,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk) 
	}

}



struct sk_buff *sk_stream_alloc_pskb(struct sock *sk,

		int size, int mem, gfp_t gfp);



static inline struct sk_buff *sk_stream_alloc_skb(struct sock *sk,

						  int size,

						  gfp_t gfp)

{

	return sk_stream_alloc_pskb(sk, size, 0, gfp);

}

struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);



static inline struct page *sk_stream_alloc_page(struct sock *sk)

{

net/ipv4/tcp.c

+4 −7
Original line number Diff line number Diff line
@@ -629,8 +629,7 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *ppos, 
	return ret;

}



struct sk_buff *sk_stream_alloc_pskb(struct sock *sk,

		int size, int mem, gfp_t gfp)

struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp)

{

	struct sk_buff *skb;
@@ -639,7 +638,6 @@ struct sk_buff *sk_stream_alloc_pskb(struct sock *sk, 


	skb = alloc_skb_fclone(size + sk->sk_prot->max_header, gfp);

	if (skb) {

		skb->truesize += mem;

		if (sk_stream_wmem_schedule(sk, skb->truesize)) {

			/*

			 * Make sure that we have exactly size bytes
@@ -692,8 +690,7 @@ new_segment: 
			if (!sk_stream_memory_free(sk))

				goto wait_for_sndbuf;



			skb = sk_stream_alloc_pskb(sk, 0, 0,

						   sk->sk_allocation);

			skb = sk_stream_alloc_skb(sk, 0, sk->sk_allocation);

			if (!skb)

				goto wait_for_memory;
@@ -873,8 +870,8 @@ new_segment: 
				if (!sk_stream_memory_free(sk))

					goto wait_for_sndbuf;



				skb = sk_stream_alloc_pskb(sk, select_size(sk),

							   0, sk->sk_allocation);

				skb = sk_stream_alloc_skb(sk, select_size(sk),

						sk->sk_allocation);

				if (!skb)

					goto wait_for_memory;

net/ipv4/tcp_output.c

+1 −1
Original line number Diff line number Diff line
@@ -1180,7 +1180,7 @@ static int tso_fragment(struct sock *sk, struct sk_buff *skb, unsigned int len, 
	if (skb->len != skb->data_len)

		return tcp_fragment(sk, skb, len, mss_now);



	buff = sk_stream_alloc_pskb(sk, 0, 0, GFP_ATOMIC);

	buff = sk_stream_alloc_skb(sk, 0, GFP_ATOMIC);

	if (unlikely(buff == NULL))

		return -ENOMEM;