Use the new helpers instead of open coding the SOCK_NOSPACE
manipulation, so that TCP can later maintain a cheaper private
copy of this bit.
No functional change intended.
Signed-off-by: Eric Dumazet <edumazet@google.com>
---
net/sunrpc/svcsock.c | 4 ++--
net/sunrpc/xprtsock.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 50e5e7f5b762de28c34d0f58cb0c6feb1e3ce79f..2d8cdee0798d540ba8eae589deaac5bd3ff889fa 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -792,11 +792,11 @@ static int svc_udp_has_wspace(struct svc_xprt *xprt)
* Set the SOCK_NOSPACE flag before checking the available
* sock space.
*/
- set_bit(SOCK_NOSPACE, &svsk->sk_sock->flags);
+ sk_set_nospace(svsk->sk_sk);
required = atomic_read(&svsk->sk_xprt.xpt_reserved) + serv->sv_max_mesg;
if (required*2 > sock_wspace(svsk->sk_sk))
return 0;
- clear_bit(SOCK_NOSPACE, &svsk->sk_sock->flags);
+ sk_clear_nospace(svsk->sk_sk);
return 1;
}
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 7f60723fa64d84887e260e5e130e44cdbec6f850..b97c70c12f627630509510facfd3c3cf96ab6cb6 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -858,7 +858,7 @@ static int xs_nospace(struct rpc_rqst *req, struct sock_xprt *transport)
if (xprt_connected(xprt)) {
/* wait for more buffer space */
set_bit(XPRT_SOCK_NOSPACE, &transport->sock_state);
- set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
+ sk_set_nospace(sk);
sk->sk_write_pending++;
xprt_wait_for_buffer_space(xprt);
} else@@ -1615,7 +1615,7 @@ static void xs_write_space(struct sock *sk)
if (!sk->sk_socket)
return;
- clear_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
+ sk_clear_nospace(sk);
if (unlikely(!(xprt = xprt_from_sock(sk))))
return;
--
2.55.0.1082.g2b9226bbc0-goog