Messages in this thread Patch in this message | | | From | Sudip Mukherjee <> | Subject | [PATCH v2] block: wrong return value | Date | Thu, 23 Oct 2014 21:34:31 +0530 |
| |
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 <sudip@vectorindia.org> ---
change in v2: added elevator_put
block/elevator.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/block/elevator.c b/block/elevator.c index 24c28b6..1267c2b 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -184,7 +184,7 @@ static void elevator_release(struct kobject *kobj) int elevator_init(struct request_queue *q, char *name) { struct elevator_type *e = NULL; - int err; + int err = 0; /* * q->sysfs_lock must be held to provide mutual exclusion between @@ -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); -- 1.8.1.2
| |