From 6876ce1f185518454024f85f60d24292aef3cdb6 Mon Sep 17 00:00:00 2001
From: Dan Williams <dan.j.williams@intel.com>
Date: Thu, 29 Dec 2011 09:16:28 +0100
Subject: [PATCH] --- yaml --- r: 277032 b: refs/heads/master c:
 f2b20d436534f22ccc3f5ad172499fcb013bb315 h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/block/blk-tag.c | 13 ++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 8e6c3a1abb5a..239e7c123cc1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 609f6ea1c9cdfe0c43a927e13205a57d0c266d5a
+refs/heads/master: f2b20d436534f22ccc3f5ad172499fcb013bb315
diff --git a/trunk/block/blk-tag.c b/trunk/block/blk-tag.c
index e74d6d13838f..4af6f5cc1167 100644
--- a/trunk/block/blk-tag.c
+++ b/trunk/block/blk-tag.c
@@ -282,18 +282,9 @@ EXPORT_SYMBOL(blk_queue_resize_tags);
 void blk_queue_end_tag(struct request_queue *q, struct request *rq)
 {
 	struct blk_queue_tag *bqt = q->queue_tags;
-	int tag = rq->tag;
+	unsigned tag = rq->tag; /* negative tags invalid */
 
-	BUG_ON(tag == -1);
-
-	if (unlikely(tag >= bqt->max_depth)) {
-		/*
-		 * This can happen after tag depth has been reduced.
-		 * But tag shouldn't be larger than real_max_depth.
-		 */
-		WARN_ON(tag >= bqt->real_max_depth);
-		return;
-	}
+	BUG_ON(tag >= bqt->real_max_depth);
 
 	list_del_init(&rq->queuelist);
 	rq->cmd_flags &= ~REQ_QUEUED;