diff options
author | Jens Axboe <axboe@suse.de> | 2005-11-21 13:49:41 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-21 14:04:52 -0500 |
commit | 8ad9ebb391e4cd75837ee608b9c33fcaceda0bc2 (patch) | |
tree | bac5dc39477176652b07dea14052d6febc2708bc /block | |
parent | f9e6bfa141c5bcf3402d98204b7b23b310be9ddb (diff) |
[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.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/block/as-iosched.c b/block/as-iosched.c index fbe050124ec5..43fa20495688 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) | |||
1371 | struct as_rq *alias; | 1371 | struct as_rq *alias; |
1372 | int data_dir; | 1372 | int data_dir; |
1373 | 1373 | ||
1374 | if (arq->state != AS_RQ_PRESCHED) { | ||
1375 | printk("arq->state: %d\n", arq->state); | ||
1376 | WARN_ON(1); | ||
1377 | } | ||
1378 | arq->state = AS_RQ_NEW; | 1374 | arq->state = AS_RQ_NEW; |
1379 | 1375 | ||
1380 | if (rq_data_dir(arq->request) == READ | 1376 | if (rq_data_dir(arq->request) == READ |