linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / block / noop-iosched.c

diff --git a/block/noop-iosched.c b/block/noop-iosched.c
index 56a7c62..f370e4a 100644 (file)
--- a/block/noop-iosched.c
+++ b/block/noop-iosched.c
@@ -65,15 +65,16 @@ noop_latter_request(request_queue_t *q, struct request *rq)
        return list_entry(rq->queuelist.next, struct request, queuelist);
 }
 
-static void *noop_init_queue(request_queue_t *q, elevator_t *e)
+static int noop_init_queue(request_queue_t *q, elevator_t *e)
 {
        struct noop_data *nd;
 
        nd = kmalloc(sizeof(*nd), GFP_KERNEL);
        if (!nd)
-               return NULL;
+               return -ENOMEM;
        INIT_LIST_HEAD(&nd->queue);
-       return nd;
+       e->elevator_data = nd;
+       return 0;
 }
 
 static void noop_exit_queue(elevator_t *e)