diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-08-19 21:46:15 -0500 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-08-19 21:46:15 -0500 |
| commit | c2126157ea3c4f72b315749e0c07a1b162a2fe2b (patch) | |
| tree | ca4113e7a20bc476a6f9d146b2ca53d93c165092 /net | |
| parent | 69f230d907e8c1ca3f9bd528993eeb98f712b0dd (diff) | |
| download | linux-stable-c2126157ea3c4f72b315749e0c07a1b162a2fe2b.tar.gz linux-stable-c2126157ea3c4f72b315749e0c07a1b162a2fe2b.tar.bz2 linux-stable-c2126157ea3c4f72b315749e0c07a1b162a2fe2b.zip | |
SUNRPC: Allow sockets to do GFP_NOIO allocations
Follow up to commit c4a7ca774949 ("SUNRPC: Allow waiting on memory
allocation"). Allows the RPC socket code to do non-IO blocking.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/xprtsock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 86ed778bb18b..723df7cb096d 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -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); |