From: Arjan van de Ven <arjan@linux.intel.com>
Date: Sat, 26 Jul 2008 02:45:38 +0000 (-0700)
Subject: Use WARN() in block/
X-Git-Tag: v2.6.27-rc1~148
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=12e0036818eed243c8ed6583ebf98261a2554e12;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/block/as-iosched.c b/block/as-iosched.c
index 9735acb5b4f..cf4eb0eefbb 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;
 	}