Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

[~andy/linux] / block / as-iosched.c

diff --git a/block/as-iosched.c b/block/as-iosched.c
index a78e160b59a3545b8a06b78e2c78e503f1494d24..43fa2049568883d6b5c07cc304b77c93d3091abf 100644 (file)
--- a/block/as-iosched.c
+++ b/block/as-iosched.c
@@ -1,6 +1,4 @@
 /*
- *  linux/drivers/block/as-iosched.c
- *
  *  Anticipatory & deadline i/o scheduler.
  *
  *  Copyright (C) 2002 Jens Axboe <axboe@suse.de>
@@ -1373,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