From: Jens Axboe Date: Mon, 21 Nov 2005 18:49:41 +0000 (+0100) Subject: [PATCH] as-iosched: remove state assertion in as_add_request() X-Git-Tag: v2.6.15-rc4~104 X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=8ad9ebb391e4cd75837ee608b9c33fcaceda0bc2 [PATCH] as-iosched: remove state assertion in as_add_request() Kill the arq->state poison statement in as_add_request(), it can trigger for perfectly valid code that just reuses a request after io completion instead of freeing it and allocating a new one. We probably should introduce a blk_init_request() to start from scratch, but for now just kill it as we will be removing the as specific poisoning soon. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds --- diff --git a/block/as-iosched.c b/block/as-iosched.c index fbe0501..43fa204 100644 --- a/block/as-iosched.c +++ b/block/as-iosched.c @@ -1371,10 +1371,6 @@ static void as_add_request(request_queue_t *q, struct request *rq) struct as_rq *alias; int data_dir; - if (arq->state != AS_RQ_PRESCHED) { - printk("arq->state: %d\n", arq->state); - WARN_ON(1); - } arq->state = AS_RQ_NEW; if (rq_data_dir(arq->request) == READ