From 589f4c02574e48d74918b8abab5c7e796be9cbb1 Mon Sep 17 00:00:00 2001 From: Muthukumar Ratty Date: Fri, 29 Jun 2012 15:31:49 +0000 Subject: [PATCH] --- yaml --- r: 316791 b: refs/heads/master c: e81ca6fe85b77109a32489a5db82f575d51dfc98 h: refs/heads/master i: 316789: ab70d44b13735d73dbaaeee6bcd642c4438069bb 316787: a0464d227f6fd2d09491192e98d1c666a636f0a8 316783: 6aba60d7c4fee6554130b8f9737987f4f59db108 v: v3 --- [refs] | 2 +- trunk/block/blk-exec.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 175bd815089b..f75c6bf3aca7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6548b0e5b875a07e32e924b22a7df3669892c75a +refs/heads/master: e81ca6fe85b77109a32489a5db82f575d51dfc98 diff --git a/trunk/block/blk-exec.c b/trunk/block/blk-exec.c index fb2cbd551621..8b6dc5bd4dd0 100644 --- a/trunk/block/blk-exec.c +++ b/trunk/block/blk-exec.c @@ -43,6 +43,9 @@ static void blk_end_sync_rq(struct request *rq, int error) * Description: * Insert a fully prepared request at the back of the I/O scheduler queue * for execution. Don't wait for completion. + * + * Note: + * This function will invoke @done directly if the queue is dead. */ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, struct request *rq, int at_head, @@ -51,18 +54,20 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK; WARN_ON(irqs_disabled()); + + rq->rq_disk = bd_disk; + rq->end_io = done; + spin_lock_irq(q->queue_lock); if (unlikely(blk_queue_dead(q))) { - spin_unlock_irq(q->queue_lock); rq->errors = -ENXIO; if (rq->end_io) rq->end_io(rq, rq->errors); + spin_unlock_irq(q->queue_lock); return; } - rq->rq_disk = bd_disk; - rq->end_io = done; __elv_add_request(q, rq, where); __blk_run_queue(q); /* the queue is stopped so it won't be run */