Messages in this thread | | | Date | Wed, 5 Nov 2008 11:21:49 -0500 (EST) | From | Alan Stern <> | Subject | Re: [PATCH 2/2] Block: use round_jiffies_up() |
| |
On Wed, 5 Nov 2008, Tejun Heo wrote:
> Hello, > > Alan Stern wrote: > > @@ -78,13 +78,14 @@ void blk_delete_timer(struct request *re > > /* > > * Nothing to detach > > */ > > - if (!q->rq_timed_out_fn || !req->deadline) > > + if (!req->deadline) > > return; > > > > list_del_init(&req->timeout_list); > > > > if (list_empty(&q->timeout_list)) > > del_timer(&q->timeout); > > + req->deadline = 0; > > } > > Actually, this can just be > > blk_delete_timer() > { > list_del_init(&req->timeout_list); > if (list_empty(&q->timeout_list)) > del_timer(&q->timeout); > } > > and none of req->deadline trick is necessary.
True. And if we do this, then there's no need to test and increment req->deadline in blk_add_timer().
Alan Stern
| |