From 55f608f3ae99813009ae15724bc39f5ba362a499 Mon Sep 17 00:00:00 2001
From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Wed, 27 May 2009 14:17:08 +0200
Subject: [PATCH] --- yaml --- r: 147064 b: refs/heads/master c:
 ba396a6c104682dfe5c8b4fbbf5974d5ac9f3687 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/block/blk-core.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 3feb47b93838..2719bf775574 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b77f777b8f1c001b63e317c4ce317292ff0ff94
+refs/heads/master: ba396a6c104682dfe5c8b4fbbf5974d5ac9f3687
diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c
index 7a4c40184a64..8b3b74e69184 100644
--- a/trunk/block/blk-core.c
+++ b/trunk/block/blk-core.c
@@ -956,8 +956,6 @@ EXPORT_SYMBOL(blk_make_request);
  */
 void blk_requeue_request(struct request_queue *q, struct request *rq)
 {
-	BUG_ON(blk_queued_rq(rq));
-
 	blk_delete_timer(rq);
 	blk_clear_rq_complete(rq);
 	trace_block_rq_requeue(q, rq);
@@ -965,6 +963,8 @@ void blk_requeue_request(struct request_queue *q, struct request *rq)
 	if (blk_rq_tagged(rq))
 		blk_queue_end_tag(q, rq);
 
+	BUG_ON(blk_queued_rq(rq));
+
 	elv_requeue_request(q, rq);
 }
 EXPORT_SYMBOL(blk_requeue_request);
@@ -2042,11 +2042,11 @@ static bool blk_update_bidi_request(struct request *rq, int error,
  */
 static void blk_finish_request(struct request *req, int error)
 {
-	BUG_ON(blk_queued_rq(req));
-
 	if (blk_rq_tagged(req))
 		blk_queue_end_tag(req->q, req);
 
+	BUG_ON(blk_queued_rq(req));
+
 	if (unlikely(laptop_mode) && blk_fs_request(req))
 		laptop_io_completion();