From 82f4dffeb7230ae2e9c6ce4d2b7c2d046baa5d6e Mon Sep 17 00:00:00 2001 From: Richard Kennedy Date: Wed, 14 Apr 2010 20:53:37 +0200 Subject: [PATCH] --- yaml --- r: 196812 b: refs/heads/master c: c0d97e9ca2cfa66bdfd1ed8ecb5dcd230924d675 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/blk-timeout.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index aee9cd8f6963..8d0aa60a59a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28baf44299e0480d66ebb3093de5d51deff04e9f +refs/heads/master: c0d97e9ca2cfa66bdfd1ed8ecb5dcd230924d675 diff --git a/trunk/block/blk-timeout.c b/trunk/block/blk-timeout.c index 1ba7e0aca878..4f0c06c7a338 100644 --- a/trunk/block/blk-timeout.c +++ b/trunk/block/blk-timeout.c @@ -109,6 +109,7 @@ void blk_rq_timed_out_timer(unsigned long data) struct request_queue *q = (struct request_queue *) data; unsigned long flags, next = 0; struct request *rq, *tmp; + int next_set = 0; spin_lock_irqsave(q->queue_lock, flags); @@ -122,16 +123,13 @@ void blk_rq_timed_out_timer(unsigned long data) if (blk_mark_rq_complete(rq)) continue; blk_rq_timed_out(rq); - } else if (!next || time_after(next, rq->deadline)) + } else if (!next_set || time_after(next, rq->deadline)) { next = rq->deadline; + next_set = 1; + } } - /* - * next can never be 0 here with the list non-empty, since we always - * bump ->deadline to 1 so we can detect if the timer was ever added - * or not. See comment in blk_add_timer() - */ - if (next) + if (next_set) mod_timer(&q->timeout, round_jiffies_up(next)); spin_unlock_irqrestore(q->queue_lock, flags);