diff options
| author | Jens Axboe <axboe@suse.de> | 2006-06-01 10:13:43 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@suse.de> | 2006-06-01 10:13:43 +0200 |
| commit | ae818a38d4755ba4c16a22a8eacec859511a5393 (patch) | |
| tree | 923ec4b261ab8b633fff2be9e7b9c4afcf704737 /block | |
| parent | 25776e3594f841b7fae7b33ebecf009a0a55bed1 (diff) | |
| download | linux-ae818a38d4755ba4c16a22a8eacec859511a5393.tar.bz2 | |
[PATCH] cfq-iosched: fix bug in timer handling for the idle class
There's a small window from when the timer is entered and we grab
the queue lock, where cfq_set_active_queue() could be rearming the
timer for us. Seen in the wild on a 12-way ppc box. Fix this by
just using mod_timer(), which will do the right thing for us.
Signed-off-by: Jens Axboe <axboe@suse.de>
Diffstat (limited to 'block')
| -rw-r--r-- | block/cfq-iosched.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 5d2047b93eb5..85d188a30f82 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -2193,10 +2193,9 @@ static void cfq_idle_class_timer(unsigned long data) * race with a non-idle queue, reset timer */ end = cfqd->last_end_request + CFQ_IDLE_GRACE; - if (!time_after_eq(jiffies, end)) { - cfqd->idle_class_timer.expires = end; - add_timer(&cfqd->idle_class_timer); - } else + if (!time_after_eq(jiffies, end)) + mod_timer(&cfqd->idle_class_timer, end); + else cfq_schedule_dispatch(cfqd); spin_unlock_irqrestore(cfqd->queue->queue_lock, flags); |