diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-30 15:24:59 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-30 15:24:59 +1000 |
| commit | f882aee0f9384f50579def938269a00baaf07cb1 (patch) | |
| tree | 3239f64b37fc9d919b907db91df69bdbf74ff1fc /net/sunrpc | |
| parent | 853ee41efe25198618955df1326fe9dda6f71ecd (diff) | |
| parent | 09ea0f7492ff0d276a3dbd26f25ec37ec152ebc1 (diff) | |
next-20140724/tip
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 c0365c14b858..9358c79fd589 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -250,7 +250,7 @@ void rpc_destroy_wait_queue(struct rpc_wait_queue *queue) } EXPORT_SYMBOL_GPL(rpc_destroy_wait_queue); -static int rpc_wait_bit_killable(void *word) +static int rpc_wait_bit_killable(struct wait_bit_key *key) { if (fatal_signal_pending(current)) return -ERESTARTSYS; @@ -309,7 +309,7 @@ static int rpc_complete_task(struct rpc_task *task) * to enforce taking of the wq->lock and hence avoid races with * rpc_complete_task(). */ -int __rpc_wait_for_completion_task(struct rpc_task *task, int (*action)(void *)) +int __rpc_wait_for_completion_task(struct rpc_task *task, wait_bit_action_f *action) { if (action == NULL) action = rpc_wait_bit_killable; |