Commit d55e1a05 authored by Trond Myklebust's avatar Trond Myklebust

RPC: Sync rpc_set_timeo() up to the 2.4.x version. In particular, this will

     ensure that the timeout shift is clamped to a maximum value of 8.

RPC: Fix by Olaf Kirch to the rpc scheduler to ensure sync tasks respect the
     "intr" mount flag.
parent 4a50d68c
...@@ -25,9 +25,18 @@ extern unsigned long rpc_calc_rto(struct rpc_rtt *rt, unsigned timer); ...@@ -25,9 +25,18 @@ extern unsigned long rpc_calc_rto(struct rpc_rtt *rt, unsigned timer);
static inline void rpc_set_timeo(struct rpc_rtt *rt, int timer, int ntimeo) static inline void rpc_set_timeo(struct rpc_rtt *rt, int timer, int ntimeo)
{ {
int *t;
if (!timer) if (!timer)
return; return;
rt->ntimeouts[timer-1] = ntimeo; t = &rt->ntimeouts[timer-1];
if (ntimeo < *t) {
if (*t > 0)
(*t)--;
} else {
if (ntimeo > 8)
ntimeo = 8;
*t = ntimeo;
}
} }
static inline int rpc_ntimeo(struct rpc_rtt *rt, int timer) static inline int rpc_ntimeo(struct rpc_rtt *rt, int timer)
......
...@@ -530,6 +530,9 @@ __rpc_execute(struct rpc_task *task) ...@@ -530,6 +530,9 @@ __rpc_execute(struct rpc_task *task)
if (!task->tk_action) if (!task->tk_action)
break; break;
task->tk_action(task); task->tk_action(task);
/* micro-optimization to avoid spinlock */
if (RPC_IS_RUNNING(task))
continue;
} }
/* /*
...@@ -545,29 +548,31 @@ __rpc_execute(struct rpc_task *task) ...@@ -545,29 +548,31 @@ __rpc_execute(struct rpc_task *task)
} }
spin_unlock_bh(&rpc_queue_lock); spin_unlock_bh(&rpc_queue_lock);
while (RPC_IS_SLEEPING(task)) { if (!RPC_IS_SLEEPING(task))
continue;
/* sync task: sleep here */ /* sync task: sleep here */
dprintk("RPC: %4d sync task going to sleep\n", dprintk("RPC: %4d sync task going to sleep\n", task->tk_pid);
task->tk_pid);
if (current->pid == rpciod_pid) if (current->pid == rpciod_pid)
printk(KERN_ERR "RPC: rpciod waiting on sync task!\n"); printk(KERN_ERR "RPC: rpciod waiting on sync task!\n");
if (!task->tk_client->cl_intr) {
__wait_event(task->tk_wait, !RPC_IS_SLEEPING(task)); __wait_event(task->tk_wait, !RPC_IS_SLEEPING(task));
dprintk("RPC: %4d sync task resuming\n", task->tk_pid); } else {
__wait_event_interruptible(task->tk_wait, !RPC_IS_SLEEPING(task), status);
/* /*
* When a sync task receives a signal, it exits with * When a sync task receives a signal, it exits with
* -ERESTARTSYS. In order to catch any callbacks that * -ERESTARTSYS. In order to catch any callbacks that
* clean up after sleeping on some queue, we don't * clean up after sleeping on some queue, we don't
* break the loop here, but go around once more. * break the loop here, but go around once more.
*/ */
if (task->tk_client->cl_intr && signalled()) { if (status == -ERESTARTSYS) {
dprintk("RPC: %4d got signal\n", task->tk_pid); dprintk("RPC: %4d got signal\n", task->tk_pid);
task->tk_flags |= RPC_TASK_KILLED; task->tk_flags |= RPC_TASK_KILLED;
rpc_exit(task, -ERESTARTSYS); rpc_exit(task, -ERESTARTSYS);
rpc_wake_up_task(task); rpc_wake_up_task(task);
} }
} }
dprintk("RPC: %4d sync task resuming\n", task->tk_pid);
} }
if (task->tk_exit) { if (task->tk_exit) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment