hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SUNRPC: Simplify queue timeouts using timer_reduce() 

Simplify the setting of queue timeouts by using the timer_reduce()
function.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
Trond Myklebust 2019-04-07 13:58:51 -04:00 committed by Anna Schumaker
parent 5efd1876e6
commit 24a9d9a21e
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/sunrpc/sched.h
View File

@ -183,7 +183,6 @@ struct rpc_task_setup {
struct rpc_timer { struct rpc_timer {
struct timer_list timer; struct timer_list timer;
struct list_head list; struct list_head list;
unsigned long expires;
}; };
/* /*

6
net/sunrpc/sched.c
View File

@ -92,8 +92,7 @@ __rpc_disable_timer(struct rpc_wait_queue *queue, struct rpc_task *task)
static void static void
rpc_set_queue_timer(struct rpc_wait_queue *queue, unsigned long expires) rpc_set_queue_timer(struct rpc_wait_queue *queue, unsigned long expires)
{ {
queue->timer_list.expires = expires; timer_reduce(&queue->timer_list.timer, expires);
mod_timer(&queue->timer_list.timer, expires);
} }
/* /*
@ -107,8 +106,7 @@ __rpc_add_timer(struct rpc_wait_queue *queue, struct rpc_task *task,
task->tk_pid, jiffies_to_msecs(timeout - jiffies)); task->tk_pid, jiffies_to_msecs(timeout - jiffies));
task->tk_timeout = timeout; task->tk_timeout = timeout;
if (list_empty(&queue->timer_list.list) || time_before(timeout, queue->timer_list.expires)) rpc_set_queue_timer(queue, timeout);
rpc_set_queue_timer(queue, timeout);
list_add(&task->u.tk_wait.timer_list, &queue->timer_list.list); list_add(&task->u.tk_wait.timer_list, &queue->timer_list.list);
} }