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

Commit c2126157 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Allow sockets to do GFP_NOIO allocations 



Follow up to commit c4a7ca77 ("SUNRPC: Allow waiting on memory
allocation"). Allows the RPC socket code to do non-IO blocking.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 69f230d9

net/sunrpc/xprtsock.c

+3 −3
Original line number Diff line number Diff line
@@ -1866,7 +1866,7 @@ static int xs_local_finish_connecting(struct rpc_xprt *xprt, 
		sk->sk_data_ready = xs_local_data_ready;

		sk->sk_write_space = xs_udp_write_space;

		sk->sk_error_report = xs_error_report;

		sk->sk_allocation = GFP_ATOMIC;

		sk->sk_allocation = GFP_NOIO;



		xprt_clear_connected(xprt);
@@ -2051,7 +2051,7 @@ static void xs_udp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock) 
		sk->sk_user_data = xprt;

		sk->sk_data_ready = xs_udp_data_ready;

		sk->sk_write_space = xs_udp_write_space;

		sk->sk_allocation = GFP_ATOMIC;

		sk->sk_allocation = GFP_NOIO;



		xprt_set_connected(xprt);
@@ -2153,7 +2153,7 @@ static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock) 
		sk->sk_state_change = xs_tcp_state_change;

		sk->sk_write_space = xs_tcp_write_space;

		sk->sk_error_report = xs_error_report;

		sk->sk_allocation = GFP_ATOMIC;

		sk->sk_allocation = GFP_NOIO;



		/* socket options */

		sock_reset_flag(sk, SOCK_LINGER);