提交 040c928c 编写于 作者: T Tejun Heo 提交者: Linus Torvalds

[PATCH] blk: cleanup generic tag support error messages

Add KERN_ERR and __FUNCTION__ to generic tag error messages, and add a comment
in blk_queue_end_tag() which explains the silent failure path.
Signed-off-by: NTejun Heo <htejun@gmail.com>
Acked-by: NJens Axboe <axboe@suse.de>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 f7d37d02
...@@ -912,10 +912,15 @@ void blk_queue_end_tag(request_queue_t *q, struct request *rq) ...@@ -912,10 +912,15 @@ void blk_queue_end_tag(request_queue_t *q, struct request *rq)
BUG_ON(tag == -1); BUG_ON(tag == -1);
if (unlikely(tag >= bqt->max_depth)) if (unlikely(tag >= bqt->max_depth))
/*
* This can happen after tag depth has been reduced.
* FIXME: how about a warning or info message here?
*/
return; return;
if (unlikely(!__test_and_clear_bit(tag, bqt->tag_map))) { if (unlikely(!__test_and_clear_bit(tag, bqt->tag_map))) {
printk("attempt to clear non-busy tag (%d)\n", tag); printk(KERN_ERR "%s: attempt to clear non-busy tag (%d)\n",
__FUNCTION__, tag);
return; return;
} }
...@@ -924,7 +929,8 @@ void blk_queue_end_tag(request_queue_t *q, struct request *rq) ...@@ -924,7 +929,8 @@ void blk_queue_end_tag(request_queue_t *q, struct request *rq)
rq->tag = -1; rq->tag = -1;
if (unlikely(bqt->tag_index[tag] == NULL)) if (unlikely(bqt->tag_index[tag] == NULL))
printk("tag %d is missing\n", tag); printk(KERN_ERR "%s: tag %d is missing\n",
__FUNCTION__, tag);
bqt->tag_index[tag] = NULL; bqt->tag_index[tag] = NULL;
bqt->busy--; bqt->busy--;
...@@ -957,8 +963,9 @@ int blk_queue_start_tag(request_queue_t *q, struct request *rq) ...@@ -957,8 +963,9 @@ int blk_queue_start_tag(request_queue_t *q, struct request *rq)
if (unlikely((rq->flags & REQ_QUEUED))) { if (unlikely((rq->flags & REQ_QUEUED))) {
printk(KERN_ERR printk(KERN_ERR
"request %p for device [%s] already tagged %d", "%s: request %p for device [%s] already tagged %d",
rq, rq->rq_disk ? rq->rq_disk->disk_name : "?", rq->tag); __FUNCTION__, rq,
rq->rq_disk ? rq->rq_disk->disk_name : "?", rq->tag);
BUG(); BUG();
} }
...@@ -1001,7 +1008,8 @@ void blk_queue_invalidate_tags(request_queue_t *q) ...@@ -1001,7 +1008,8 @@ void blk_queue_invalidate_tags(request_queue_t *q)
rq = list_entry_rq(tmp); rq = list_entry_rq(tmp);
if (rq->tag == -1) { if (rq->tag == -1) {
printk("bad tag found on list\n"); printk(KERN_ERR
"%s: bad tag found on list\n", __FUNCTION__);
list_del_init(&rq->queuelist); list_del_init(&rq->queuelist);
rq->flags &= ~REQ_QUEUED; rq->flags &= ~REQ_QUEUED;
} else } else
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册