Commit d32f6b57 authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Jens Axboe

block: fix wrong error return in elevator_init()

while compiling integer err was showing as a set but unused variable.
elevator_init_fn can be either cfq_init_queue or deadline_init_queue
or noop_init_queue.
all three of these functions are returning -ENOMEM if they fail to
allocate the queue.
so we should actually be returning the error code rather than
returning 0 always.
Signed-off-by: default avatarSudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 84ce0f0e
...@@ -229,7 +229,9 @@ int elevator_init(struct request_queue *q, char *name) ...@@ -229,7 +229,9 @@ int elevator_init(struct request_queue *q, char *name)
} }
err = e->ops.elevator_init_fn(q, e); err = e->ops.elevator_init_fn(q, e);
return 0; if (err)
elevator_put(e);
return err;
} }
EXPORT_SYMBOL(elevator_init); EXPORT_SYMBOL(elevator_init);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment