diff --git a/[refs] b/[refs] index 1a6952d58dc5..7c78de7ab0e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 261c40c1191ad8d7a2e49fa2bb5f6a84e3d44b10 +refs/heads/master: 12e0036818eed243c8ed6583ebf98261a2554e12 diff --git a/trunk/block/as-iosched.c b/trunk/block/as-iosched.c index 9735acb5b4f5..cf4eb0eefbbf 100644 --- a/trunk/block/as-iosched.c +++ b/trunk/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; }