Commit 14bfee9b authored by Pavel Begunkov's avatar Pavel Begunkov Committed by David S. Miller
Browse files

sock: dedup sock_def_write_space wmem_alloc checks 



Except for minor rounding differences the first ->sk_wmem_alloc test in
sock_def_write_space() is a hand coded version of sock_writeable().
Replace it with the helper, and also kill the following if duplicating
the check.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0ed99ecc

net/core/sock.c

+2 −3
Original line number Diff line number Diff line
@@ -3191,14 +3191,13 @@ static void sock_def_write_space(struct sock *sk) 
	/* Do not wake up a writer until he can make "significant"

	 * progress.  --DaveM

	 */

	if ((refcount_read(&sk->sk_wmem_alloc) << 1) <= READ_ONCE(sk->sk_sndbuf)) {

	if (sock_writeable(sk)) {

		wq = rcu_dereference(sk->sk_wq);

		if (skwq_has_sleeper(wq))

			wake_up_interruptible_sync_poll(&wq->wait, EPOLLOUT |

						EPOLLWRNORM | EPOLLWRBAND);



		/* Should agree with poll, otherwise some programs break */

		if (sock_writeable(sk))

		sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT);

	}