diff options
| author | Tejun Heo <tj@kernel.org> | 2012-03-05 13:14:57 -0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-03-06 21:27:21 +0100 |
| commit | b2fab5acd28ead6f0dd6c3996ba23f0ef1772f15 (patch) | |
| tree | b0b96984e1a4d9c856edc9ddfc36e427951c5a86 /block/noop-iosched.c | |
| parent | 5a5bafdc396b1da7570f84fb96a0f8a288970c5e (diff) | |
| download | lwn-b2fab5acd28ead6f0dd6c3996ba23f0ef1772f15.tar.gz lwn-b2fab5acd28ead6f0dd6c3996ba23f0ef1772f15.zip | |
elevator: make elevator_init_fn() return 0/-errno
elevator_ops->elevator_init_fn() has a weird return value. It returns
a void * which the caller should assign to q->elevator->elevator_data
and %NULL return denotes init failure.
Update such that it returns integer 0/-errno and sets elevator_data
directly as necessary.
This makes the interface more conventional and eases further cleanup.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/noop-iosched.c')
| -rw-r--r-- | block/noop-iosched.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/block/noop-iosched.c b/block/noop-iosched.c index 413a0b1d788c..5d1bf70e33d5 100644 --- a/block/noop-iosched.c +++ b/block/noop-iosched.c @@ -59,15 +59,17 @@ noop_latter_request(struct request_queue *q, struct request *rq) return list_entry(rq->queuelist.next, struct request, queuelist); } -static void *noop_init_queue(struct request_queue *q) +static int noop_init_queue(struct request_queue *q) { struct noop_data *nd; nd = kmalloc_node(sizeof(*nd), GFP_KERNEL, q->node); if (!nd) - return NULL; + return -ENOMEM; + INIT_LIST_HEAD(&nd->queue); - return nd; + q->elevator->elevator_data = nd; + return 0; } static void noop_exit_queue(struct elevator_queue *e) |