openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] CFQ: bad locking in changed_ioprio() 

When the ioprio code recently got juggled a bit, a bug was introduced.
changed_ioprio() is no longer called with interrupts disabled, so using
plain spin_lock() on the queue_lock is a bug.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jens Axboe 2006-10-30 19:54:23 +01:00 committed by Linus Torvalds
parent 0261d6886e
commit c1b707d253
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
block/cfq-iosched.c
View File

@ -1215,11 +1215,12 @@ static inline void changed_ioprio(struct cfq_io_context *cic)
{ {
struct cfq_data *cfqd = cic->key; struct cfq_data *cfqd = cic->key;
struct cfq_queue *cfqq; struct cfq_queue *cfqq;
unsigned long flags;
if (unlikely(!cfqd)) if (unlikely(!cfqd))
return; return;
spin_lock(cfqd->queue->queue_lock); spin_lock_irqsave(cfqd->queue->queue_lock, flags);
cfqq = cic->cfqq[ASYNC]; cfqq = cic->cfqq[ASYNC];
if (cfqq) { if (cfqq) {
@ -1236,7 +1237,7 @@ static inline void changed_ioprio(struct cfq_io_context *cic)
if (cfqq) if (cfqq)
cfq_mark_cfqq_prio_changed(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) static void cfq_ioc_set_ioprio(struct io_context *ioc)