block: wrong return value
PATCH 1/1 block: wrong return value
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.
---
hi,
if my understanding was wrong and if it is indeed a case of unusued variable,
then please discard this patch.
block/elevator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
block/elevator.c +2 -2
@@ -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,7 @@ int elevator_init(struct request_queue *q, char *name) } err = e->ops.elevator_init_fn (q, e); -return 0 ; +return err; }EXPORT_SYMBOL (elevator_init);
Signature · 1 line
1.8.1.2
Jens Axboe
maintainerQuoted 7 lines · Sudip Mukherjee
while compiling integer err was showing as a set but unused variable.
elevator_init_fncan be eithercfq_init_queueordeadline_init_queueornoop_init_queue.
all three of these functions are returning-ENOMEMif they fail to allocate the queue.
so we should actually be returning the error code rather than returning 0 always.
That does look weird. You need an elevator_put() in the error case, though, ala:
err = e->ops.elevator_init_fn(q, e);
if (err)
elevator_put(e);
return err;
Signature · 1 line
Jens Axboe
Quoted 9 lines · Jens Axboe
Quoted 7 lines · Sudip Mukherjee
while compiling integer err was showing as a set but unused variable.
elevator_init_fncan be eithercfq_init_queueordeadline_init_queueornoop_init_queue.
all three of these functions are returning-ENOMEMif they fail to allocate the queue.
so we should actually be returning the error code rather than returning 0 always.
Quoted 3 lines
That does look weird. You need an
elevator_put()in the error case, though, ala:
oops.. sorry i missed that elevator_get in the code. I will send you v2 of the patch.
thanks
sudip
Quoted 10 lines
err =
e->ops.elevator_init_fn(q, e);
if (err)elevator_put(e);return err;
Signature · 1 line
Jens Axboe