summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2009-04-15 12:11:10 +0200
committerJens Axboe <jens.axboe@oracle.com>2009-04-15 12:11:10 +0200
commit40bb54d197a10fe86d73073ee8202ba2812a05fa (patch)
treeb0555a89cd9e40abbcdd420cdfb4a9113cd67042 /block
parentc2572f2b4ffc27ba79211aceee3bef53a59bb5cd (diff)
downloadlinux-stable-40bb54d197a10fe86d73073ee8202ba2812a05fa.tar.gz
linux-stable-40bb54d197a10fe86d73073ee8202ba2812a05fa.tar.bz2
linux-stable-40bb54d197a10fe86d73073ee8202ba2812a05fa.zip
cfq-iosched: no need to save interrupts in cfq_kick_queue()
It's called from the workqueue handlers from process context, so we always have irqs enabled when entered. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block')
-rw-r--r--block/cfq-iosched.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 56e9d8503cf1..e59f2108272f 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -2157,11 +2157,10 @@ static void cfq_kick_queue(struct work_struct *work)
struct cfq_data *cfqd =
container_of(work, struct cfq_data, unplug_work);
struct request_queue *q = cfqd->queue;
- unsigned long flags;
- spin_lock_irqsave(q->queue_lock, flags);
+ spin_lock_irq(q->queue_lock);
blk_start_queueing(q);
- spin_unlock_irqrestore(q->queue_lock, flags);
+ spin_unlock_irq(q->queue_lock);
}
/*