diff options
author | Tao Ma <boyu.mt@taobao.com> | 2011-10-25 04:20:05 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2011-10-25 04:20:05 -0400 |
commit | 5e08159197b5b98a6648a172008de23f420e6c11 (patch) | |
tree | 7d9d9b275f8b62fa5069012df293e0af364bce86 /block | |
parent | 83157223defe3be490cfea048e83451b6f254216 (diff) |
block: warn if tag is greater than real_max_depth.
In case tag depth is reduced, it is max_depth not real_max_depth.
So we should allow a request with tag >= max_depth, but for a
tag >= real_max_depth, there really should be some problem.
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-tag.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/block/blk-tag.c b/block/blk-tag.c index ece65fc4c79b..e74d6d13838f 100644 --- a/block/blk-tag.c +++ b/block/blk-tag.c | |||
@@ -286,12 +286,14 @@ void blk_queue_end_tag(struct request_queue *q, struct request *rq) | |||
286 | 286 | ||
287 | BUG_ON(tag == -1); | 287 | BUG_ON(tag == -1); |
288 | 288 | ||
289 | if (unlikely(tag >= bqt->real_max_depth)) | 289 | if (unlikely(tag >= bqt->max_depth)) { |
290 | /* | 290 | /* |
291 | * This can happen after tag depth has been reduced. | 291 | * This can happen after tag depth has been reduced. |
292 | * FIXME: how about a warning or info message here? | 292 | * But tag shouldn't be larger than real_max_depth. |
293 | */ | 293 | */ |
294 | WARN_ON(tag >= bqt->real_max_depth); | ||
294 | return; | 295 | return; |
296 | } | ||
295 | 297 | ||
296 | list_del_init(&rq->queuelist); | 298 | list_del_init(&rq->queuelist); |
297 | rq->cmd_flags &= ~REQ_QUEUED; | 299 | rq->cmd_flags &= ~REQ_QUEUED; |