diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 03:51:15 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 03:51:15 -0500 |
commit | 4ab432677957e0a064bba3690004d3244de8ad6c (patch) | |
tree | 4ef5785f20be6f62bfc7fbe4f124e1751c9cabf5 /block/as-iosched.c | |
parent | 30765528d156e58d41ed07cae8726c9105111b9d (diff) | |
parent | 624f54be206adf970cd8eece16446b027913e533 (diff) |
Merge branch 'master'
Diffstat (limited to 'block/as-iosched.c')
-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 |