From d18bed89807f1814c74276ae9b7bebdd2c0eb906 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Fri, 9 Nov 2007 12:52:45 +0100
Subject: [PATCH] --- yaml --- r: 73349 b: refs/heads/master c:
 d85532ed284e63b5c56eaf2418f262822af60be4 h: refs/heads/master i:   73347:
 0562b8112a16d29b3034aefa2bcbe4a7f6714558 v: v3

---
 [refs]                  |  2 +-
 trunk/block/ll_rw_blk.c | 17 ++---------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 2bf3c656f7a9..765a9dbe3ddd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8578007065bd27ec077a74b5814f0fe4df040180
+refs/heads/master: d85532ed284e63b5c56eaf2418f262822af60be4
diff --git a/trunk/block/ll_rw_blk.c b/trunk/block/ll_rw_blk.c
index 75c98d58f4dd..3d489915fd22 100644
--- a/trunk/block/ll_rw_blk.c
+++ b/trunk/block/ll_rw_blk.c
@@ -1143,22 +1143,9 @@ EXPORT_SYMBOL(blk_queue_start_tag);
 void blk_queue_invalidate_tags(struct request_queue *q)
 {
 	struct list_head *tmp, *n;
-	struct request *rq;
-
-	list_for_each_safe(tmp, n, &q->tag_busy_list) {
-		rq = list_entry_rq(tmp);
 
-		if (rq->tag == -1) {
-			printk(KERN_ERR
-			       "%s: bad tag found on list\n", __FUNCTION__);
-			list_del_init(&rq->queuelist);
-			rq->cmd_flags &= ~REQ_QUEUED;
-		} else
-			blk_queue_end_tag(q, rq);
-
-		rq->cmd_flags &= ~REQ_STARTED;
-		__elv_add_request(q, rq, ELEVATOR_INSERT_BACK, 0);
-	}
+	list_for_each_safe(tmp, n, &q->tag_busy_list)
+		blk_requeue_request(q, list_entry_rq(tmp));
 }
 
 EXPORT_SYMBOL(blk_queue_invalidate_tags);