From e536195ed541a34b6d56431a4b677730b51c10ea Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Mon, 30 Oct 2006 19:54:23 +0100 Subject: [PATCH] --- yaml --- r: 40463 b: refs/heads/master c: c1b707d253fe918b92882cff1dbd926b47e14fd2 h: refs/heads/master i: 40461: 63015d449c8db497ff1b51ea296ceec8e460c006 40459: cd912b95ec6057dcbaa885c41fb93fb783816f9e 40455: 1b2f44484d37d4c4b130a1da1f85ced2069e62ec 40447: 88bcbb1b3c3732b8dc6577f5697ba9cb320eb2b7 v: v3 --- [refs] | 2 +- trunk/block/cfq-iosched.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1aa65a9f2f1f..6abfe26bd467 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0261d6886eb5822867a5310dc1e4479b940a1942 +refs/heads/master: c1b707d253fe918b92882cff1dbd926b47e14fd2 diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index 5c3da894a56c..25c4e7ed0d00 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -1215,11 +1215,12 @@ static inline void changed_ioprio(struct cfq_io_context *cic) { struct cfq_data *cfqd = cic->key; struct cfq_queue *cfqq; + unsigned long flags; if (unlikely(!cfqd)) return; - spin_lock(cfqd->queue->queue_lock); + spin_lock_irqsave(cfqd->queue->queue_lock, flags); cfqq = cic->cfqq[ASYNC]; if (cfqq) { @@ -1236,7 +1237,7 @@ static inline void changed_ioprio(struct cfq_io_context *cic) if (cfqq) cfq_mark_cfqq_prio_changed(cfqq); - spin_unlock(cfqd->queue->queue_lock); + spin_unlock_irqrestore(cfqd->queue->queue_lock, flags); } static void cfq_ioc_set_ioprio(struct io_context *ioc)