| Message ID | 1425374665-446-1-git-send-email-hofrat@osadl.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
I'll assume Trond or Anna gets this one.--b. On Tue, Mar 03, 2015 at 04:24:25AM -0500, Nicholas Mc Guire wrote: > Use jiffies_to_msecs for converting jiffies as it handles all of the corner > cases reliably and also helps readability. > > Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> > --- > > This was only compile tested for x86_64_defconfig (implies CONFIG_SUNRPC=y) > > Patch is against 4.0-rc1 (localversion-next is -next-20150303) > > net/sunrpc/sched.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c > index b91fd9c..c234e7f 100644 > --- a/net/sunrpc/sched.c > +++ b/net/sunrpc/sched.c > @@ -90,7 +90,7 @@ __rpc_add_timer(struct rpc_wait_queue *queue, struct rpc_task *task) > return; > > dprintk("RPC: %5u setting alarm for %lu ms\n", > - task->tk_pid, task->tk_timeout * 1000 / HZ); > + task->tk_pid, jiffies_to_msecs(task->tk_timeout)); > > task->u.tk_wait.expires = jiffies + task->tk_timeout; > if (list_empty(&queue->timer_list.list) || time_before(task->u.tk_wait.expires, queue->timer_list.expires)) > -- > 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, 2015-03-03 at 04:24 -0500, Nicholas Mc Guire wrote: > Use jiffies_to_msecs for converting jiffies as it handles all of the corner > cases reliably and also helps readability. > > Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> > --- > > This was only compile tested for x86_64_defconfig (implies CONFIG_SUNRPC=y) > > Patch is against 4.0-rc1 (localversion-next is -next-20150303) > > net/sunrpc/sched.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c > index b91fd9c..c234e7f 100644 > --- a/net/sunrpc/sched.c > +++ b/net/sunrpc/sched.c > @@ -90,7 +90,7 @@ __rpc_add_timer(struct rpc_wait_queue *queue, struct rpc_task *task) > return; > > dprintk("RPC: %5u setting alarm for %lu ms\n", > - task->tk_pid, task->tk_timeout * 1000 / HZ); > + task->tk_pid, jiffies_to_msecs(task->tk_timeout)); > > task->u.tk_wait.expires = jiffies + task->tk_timeout; > if (list_empty(&queue->timer_list.list) || time_before(task->u.tk_wait.expires, queue->timer_list.expires)) Thanks! Applied.
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c index b91fd9c..c234e7f 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -90,7 +90,7 @@ __rpc_add_timer(struct rpc_wait_queue *queue, struct rpc_task *task) return; dprintk("RPC: %5u setting alarm for %lu ms\n", - task->tk_pid, task->tk_timeout * 1000 / HZ); + task->tk_pid, jiffies_to_msecs(task->tk_timeout)); task->u.tk_wait.expires = jiffies + task->tk_timeout; if (list_empty(&queue->timer_list.list) || time_before(task->u.tk_wait.expires, queue->timer_list.expires))
Use jiffies_to_msecs for converting jiffies as it handles all of the corner cases reliably and also helps readability. Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> --- This was only compile tested for x86_64_defconfig (implies CONFIG_SUNRPC=y) Patch is against 4.0-rc1 (localversion-next is -next-20150303) net/sunrpc/sched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)