From d32f6b57523b6e9b2e39e990e056f9882a6f099a Mon Sep 17 00:00:00 2001 From: Sudip Mukherjee Date: Thu, 23 Oct 2014 22:16:48 +0530 Subject: 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: Sudip Mukherjee Signed-off-by: Jens Axboe --- block/elevator.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'block/elevator.c') diff --git a/block/elevator.c b/block/elevator.c index 24c28b659bb3..afa3b037a17c 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -229,7 +229,9 @@ int elevator_init(struct request_queue *q, char *name) } err = e->ops.elevator_init_fn(q, e); - return 0; + if (err) + elevator_put(e); + return err; } EXPORT_SYMBOL(elevator_init); -- cgit v1.2.3-59-g8ed1b