2.6.24

 block

diff --git a/block/as-iosched.c b/block/as-iosched.c
index dc715a5..cb5e53b 100644
--- a/block/as-iosched.c
+++ b/block/as-iosched.c
@@ -880,7 +880,7 @@ static void as_remove_queued_request(struct request_queue *q,
 }
 
 /*
- * as_fifo_expired returns 0 if there are no expired reads on the fifo,
+ * as_fifo_expired returns 0 if there are no expired requests on the fifo,
  * 1 otherwise.  It is ratelimited so that we only perform the check once per
  * `fifo_expire' interval.  Otherwise a large number of expired requests
  * would create a hopeless seekstorm.
@@ -1097,7 +1097,8 @@ dispatch_writes:
       ad->batch_data_dir = REQ_ASYNC;
       ad->current_write_count = ad->write_batch_count;
       ad->write_batch_idled = 0;
-      rq = ad->next_rq[ad->batch_data_dir];
+      rq = rq_entry_fifo(ad->fifo_list[REQ_ASYNC].next);
+      ad->last_check_fifo[REQ_ASYNC] = jiffies;
       goto dispatch_request;
    }
 
@@ -1159,7 +1160,7 @@ static void as_add_request(struct request_queue *q, struct request *rq)
    as_add_rq_rb(ad, rq);
 
    /*
-    * set expire time (only used for reads) and add to fifo list
+    * set expire time and add to fifo list
     */
    rq_set_fifo_time(rq, jiffies + ad->fifo_expire[data_dir]);
    list_add_tail(&rq->queuelist, &ad->fifo_list[data_dir]);
@@ -1463,7 +1464,9 @@ static struct elevator_type iosched_as = {
 
 static int __init as_init(void)
 {
-   return elv_register(&iosched_as);
+   elv_register(&iosched_as);
+
+   return 0;
 }
 
 static void __exit as_exit(void)