From 7b8f64fdb8503504bf7b5fddb9b9143a4c82533f Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 22 Mar 2006 08:08:01 +0100 Subject: [PATCH] --- yaml --- r: 24429 b: refs/heads/master c: 4c5d0bbde9669cfb7f7fd4670dc9a117aea90384 h: refs/heads/master i: 24427: 82b0f9c6529641dddfbd5217895897a3f22819f3 v: v3 --- [refs] | 2 +- trunk/block/ll_rw_blk.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index eed642af2a40..2b036951152c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8fca1c7682105c843319728d8e37b42b19092bb +refs/heads/master: 4c5d0bbde9669cfb7f7fd4670dc9a117aea90384 diff --git a/trunk/block/ll_rw_blk.c b/trunk/block/ll_rw_blk.c index b836b43113da..7fc903b5f3cd 100644 --- a/trunk/block/ll_rw_blk.c +++ b/trunk/block/ll_rw_blk.c @@ -2477,10 +2477,12 @@ void blk_execute_rq_nowait(request_queue_t *q, struct gendisk *bd_disk, rq->rq_disk = bd_disk; rq->flags |= REQ_NOMERGE; rq->end_io = done; - elv_add_request(q, rq, where, 1); - generic_unplug_device(q); + WARN_ON(irqs_disabled()); + spin_lock_irq(q->queue_lock); + __elv_add_request(q, rq, where, 1); + __generic_unplug_device(q); + spin_unlock_irq(q->queue_lock); } - EXPORT_SYMBOL_GPL(blk_execute_rq_nowait); /**