[PATCH] block: warn the wrong tag only if it is greater than real_max_depth.

[Tao Ma]

From: Tao Ma <boyu.mt@xxxxxxxxxx>

In queue depth decreases, we could meet with a tag greater than max_depth,
but it should never be greater than real_max_depth. So only WARN if
it is greater than real_max_depth and let it complets if it is greater
than max_depth.

Reported-by: Dan Williams <dan.j.williams@xxxxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Tao Ma <boyu.mt@xxxxxxxxxx>
---
 block/blk-tag.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/block/blk-tag.c b/block/blk-tag.c
index e74d6d1..1c50d34 100644
--- a/block/blk-tag.c
+++ b/block/blk-tag.c
@@ -286,12 +286,12 @@ void blk_queue_end_tag(struct request_queue *q, struct request *rq)
 
 	BUG_ON(tag == -1);
 
-	if (unlikely(tag >= bqt->max_depth)) {
+	if (unlikely(tag >= bqt->real_max_depth)) {
 		/*
-		 * This can happen after tag depth has been reduced.
-		 * But tag shouldn't be larger than real_max_depth.
+		 * tag shouldn't be larger than real_max_depth.
 		 */
-		WARN_ON(tag >= bqt->real_max_depth);
+		WARN(1, "tag %d, bqt->real_max_depth %d\n",
+		     tag, bqt->real_max_depth);
 		return;
 	}
 
-- 
1.7.4.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/