diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-01-23 14:50:56 -0500 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-01-24 18:46:50 -0500 |
| commit | c4a7ca774949960064dac11b326908f28407e8c3 (patch) | |
| tree | 7c014e0e1980ced7e5c350bd1d964fd58d5ab2e6 /net/sunrpc | |
| parent | 127b21b89f9d8ba0dc23e47b8c35d8a0bac9d6fc (diff) | |
| download | linux-stable-c4a7ca774949960064dac11b326908f28407e8c3.tar.gz linux-stable-c4a7ca774949960064dac11b326908f28407e8c3.tar.bz2 linux-stable-c4a7ca774949960064dac11b326908f28407e8c3.zip | |
SUNRPC: Allow waiting on memory allocation
We should be safe now, as long as we don't do GFP_IO or higher allocations
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'net/sunrpc')
| -rw-r--r-- | net/sunrpc/sched.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c index 4f65ec28d2b4..b91fd9c597b4 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -844,10 +844,10 @@ static void rpc_async_schedule(struct work_struct *work) void *rpc_malloc(struct rpc_task *task, size_t size) { struct rpc_buffer *buf; - gfp_t gfp = GFP_NOWAIT | __GFP_NOWARN; + gfp_t gfp = GFP_NOIO | __GFP_NOWARN; if (RPC_IS_SWAPPER(task)) - gfp |= __GFP_MEMALLOC; + gfp = __GFP_MEMALLOC | GFP_NOWAIT | __GFP_NOWARN; size += sizeof(struct rpc_buffer); if (size <= RPC_BUFFER_MAXSIZE) |