summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2008-07-26 06:45:38 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-26 23:00:07 +0400
commit12e0036818eed243c8ed6583ebf98261a2554e12 (patch)
tree2f60ad7d1c869a995faa5b73150b409705d0e8b2
parent261c40c1191ad8d7a2e49fa2bb5f6a84e3d44b10 (diff)
downloadlinux-12e0036818eed243c8ed6583ebf98261a2554e12.tar.xz
Use WARN() in block/
Use WARN() instead of a printk+WARN_ON() pair; this way the message becomes part of the warning section for better reporting/collection. Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Cc: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--block/as-iosched.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/block/as-iosched.c b/block/as-iosched.c
index 9735acb5b4f5..cf4eb0eefbbf 100644
--- a/block/as-iosched.c
+++ b/block/as-iosched.c
@@ -837,8 +837,7 @@ static void as_completed_request(struct request_queue *q, struct request *rq)
WARN_ON(!list_empty(&rq->queuelist));
if (RQ_STATE(rq) != AS_RQ_REMOVED) {
- printk("rq->state %d\n", RQ_STATE(rq));
- WARN_ON(1);
+ WARN(1, "rq->state %d\n", RQ_STATE(rq));
goto out;
}