diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-01-10 07:53:55 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-01-10 07:53:55 -0800 |
| commit | 8b63b6bfc1a551acf154061699028c7032d7890c (patch) | |
| tree | 16882e9bc9e35eacb870a6d8a71617e579c4ffdc /net/sunrpc/sched.c | |
| parent | e07ecd76d4db7bda1e9495395b2110a3fe28845a (diff) | |
| parent | 55f5560d8c18fe33fc169f8d244a9247dcac7612 (diff) | |
Merge branch 'for-4.5/block-dax' into for-4.5/libnvdimmlibnvdimm-for-4.5
Diffstat (limited to 'net/sunrpc/sched.c')
| -rw-r--r-- | net/sunrpc/sched.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c index f14f24ee9983..73ad57a59989 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -250,11 +250,11 @@ void rpc_destroy_wait_queue(struct rpc_wait_queue *queue) } EXPORT_SYMBOL_GPL(rpc_destroy_wait_queue); -static int rpc_wait_bit_killable(struct wait_bit_key *key) +static int rpc_wait_bit_killable(struct wait_bit_key *key, int mode) { - if (fatal_signal_pending(current)) - return -ERESTARTSYS; freezable_schedule_unsafe(); + if (signal_pending_state(mode, current)) + return -ERESTARTSYS; return 0; } |