From 5a8b67350412823416b2e8e30b3fc1723efe04a3 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Wed, 15 Apr 2009 12:11:10 +0200 Subject: [PATCH] --- yaml --- r: 143346 b: refs/heads/master c: 40bb54d197a10fe86d73073ee8202ba2812a05fa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/cfq-iosched.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5f4333b7b371..7c4c488b0f80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2572f2b4ffc27ba79211aceee3bef53a59bb5cd +refs/heads/master: 40bb54d197a10fe86d73073ee8202ba2812a05fa diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index 56e9d8503cf1..e59f2108272f 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/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); } /*