Browse Source

[PATCH] blk_execute_rq_nowait-speedup

Both elv_add_request() and generic_unplug_device() grab the queue lock
and disable interrupts, do that locally and use the __ variants.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jens Axboe <axboe@suse.de>
Andrew Morton 19 years ago
parent
commit
4c5d0bbde9
1 changed files with 5 additions and 3 deletions
  1. 5 3
      block/ll_rw_blk.c

+ 5 - 3
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->rq_disk = bd_disk;
 	rq->flags |= REQ_NOMERGE;
 	rq->flags |= REQ_NOMERGE;
 	rq->end_io = done;
 	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);
 EXPORT_SYMBOL_GPL(blk_execute_rq_nowait);
 
 
 /**
 /**