diff options
author | Ingo Molnar <mingo@elte.hu> | 2012-01-08 12:31:24 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2012-01-08 12:31:24 +0100 |
commit | 636f0c70f2557e0819b50c74e31b4a027327015e (patch) | |
tree | 3a259ef26659dac92782651440091b9f5ab1a7f7 /block/blk-tag.c | |
parent | Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core (diff) | |
parent | recordmcount: Fix handling of elf64 big-endian objects. (diff) | |
download | linux-dev-636f0c70f2557e0819b50c74e31b4a027327015e.tar.xz linux-dev-636f0c70f2557e0819b50c74e31b4a027327015e.zip |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Diffstat (limited to 'block/blk-tag.c')
-rw-r--r-- | block/blk-tag.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/block/blk-tag.c b/block/blk-tag.c index e74d6d13838f..4af6f5cc1167 100644 --- a/block/blk-tag.c +++ b/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; |