---

yaml --- r: 129 b: refs/heads/master c: a299738 h: refs/heads/master i: 127: 638136b v: v3
git-mirror · Apr 16, 2005 · 173fff5 · 173fff5
1 parent 041a265
commit 173fff5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 975e046cc06005bafe0c5ce81d55a1b1eb84f5a1
+refs/heads/master: a299738283a654544c75167d190d9e87b77e5fb7
diff --git a/trunk/drivers/block/ll_rw_blk.c b/trunk/drivers/block/ll_rw_blk.c
@@ -1589,7 +1589,8 @@ void blk_run_queue(struct request_queue *q)
 
 	spin_lock_irqsave(q->queue_lock, flags);
 	blk_remove_plug(q);
-	q->request_fn(q);
+	if (!elv_queue_empty(q))
+		q->request_fn(q);
 	spin_unlock_irqrestore(q->queue_lock, flags);
 }
 EXPORT_SYMBOL(blk_run_queue);