projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
svc: Make svc_sock the tcp/udp transport
[powerpc.git]
/
net
/
sunrpc
/
sched.c
diff --git
a/net/sunrpc/sched.c
b/net/sunrpc/sched.c
index
40ce6f6
..
4c66912
100644
(file)
--- a/
net/sunrpc/sched.c
+++ b/
net/sunrpc/sched.c
@@
-245,9
+245,9
@@
void rpc_init_wait_queue(struct rpc_wait_queue *queue, const char *qname)
}
EXPORT_SYMBOL_GPL(rpc_init_wait_queue);
}
EXPORT_SYMBOL_GPL(rpc_init_wait_queue);
-static int rpc_wait_bit_
interrupti
ble(void *word)
+static int rpc_wait_bit_
killa
ble(void *word)
{
{
- if (signal_pending(current))
+ if (
fatal_
signal_pending(current))
return -ERESTARTSYS;
schedule();
return 0;
return -ERESTARTSYS;
schedule();
return 0;
@@
-299,9
+299,9
@@
static void rpc_mark_complete_task(struct rpc_task *task)
int __rpc_wait_for_completion_task(struct rpc_task *task, int (*action)(void *))
{
if (action == NULL)
int __rpc_wait_for_completion_task(struct rpc_task *task, int (*action)(void *))
{
if (action == NULL)
- action = rpc_wait_bit_
interrupti
ble;
+ action = rpc_wait_bit_
killa
ble;
return wait_on_bit(&task->tk_runstate, RPC_TASK_ACTIVE,
return wait_on_bit(&task->tk_runstate, RPC_TASK_ACTIVE,
- action, TASK_
INTERRUPTI
BLE);
+ action, TASK_
KILLA
BLE);
}
EXPORT_SYMBOL_GPL(__rpc_wait_for_completion_task);
}
EXPORT_SYMBOL_GPL(__rpc_wait_for_completion_task);
@@
-696,10
+696,9
@@
static void __rpc_execute(struct rpc_task *task)
/* sync task: sleep here */
dprintk("RPC: %5u sync task going to sleep\n", task->tk_pid);
/* sync task: sleep here */
dprintk("RPC: %5u sync task going to sleep\n", task->tk_pid);
- /* Note: Caller should be using rpc_clnt_sigmask() */
status = out_of_line_wait_on_bit(&task->tk_runstate,
status = out_of_line_wait_on_bit(&task->tk_runstate,
- RPC_TASK_QUEUED, rpc_wait_bit_
interrupti
ble,
- TASK_
INTERRUPTI
BLE);
+ RPC_TASK_QUEUED, rpc_wait_bit_
killa
ble,
+ TASK_
KILLA
BLE);
if (status == -ERESTARTSYS) {
/*
* When a sync task receives a signal, it exits with
if (status == -ERESTARTSYS) {
/*
* When a sync task receives a signal, it exits with
@@
-840,8
+839,6
@@
static void rpc_init_task(struct rpc_task *task, const struct rpc_task_setup *ta
kref_get(&task->tk_client->cl_kref);
if (task->tk_client->cl_softrtry)
task->tk_flags |= RPC_TASK_SOFT;
kref_get(&task->tk_client->cl_kref);
if (task->tk_client->cl_softrtry)
task->tk_flags |= RPC_TASK_SOFT;
- if (!task->tk_client->cl_intr)
- task->tk_flags |= RPC_TASK_NOINTR;
}
if (task->tk_ops->rpc_call_prepare != NULL)
}
if (task->tk_ops->rpc_call_prepare != NULL)