aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <axboe@suse.de>2005-11-21 19:49:41 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-21 11:04:52 -0800
commit8ad9ebb391e4cd75837ee608b9c33fcaceda0bc2 (patch)
treebac5dc39477176652b07dea14052d6febc2708bc /block
parentf9e6bfa141c5bcf3402d98204b7b23b310be9ddb (diff)
downloadlinux-2.6.34-ux500-8ad9ebb391e4cd75837ee608b9c33fcaceda0bc2.tar.gz
[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 <axboe@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'block')
-rw-r--r--block/as-iosched.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/block/as-iosched.c b/block/as-iosched.c
index fbe050124ec..43fa2049568 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