Re: [PATCH 04/11] block: Return error code of elevator init function

[Jeff Moyer <jmoyer@redhat.com>]

Andi Kleen <andi@firstfloor.org> writes:

> From: Andi Kleen <ak@linux.intel.com>
>
> The error code was ignored, which I assume is a mistake.

Yeah, introduced in d50235b7bc3ee0a0427984d763ea7534149531b4, so I cc'd
Jianpeng Ma, though it looks pretty obvious.

Reviewed-by: Jeff Moyer <jmoyer@redhat.com>

> Cc: axboe@kernel.dk
> Signed-off-by: Andi Kleen <ak@linux.intel.com>
> ---
>  block/elevator.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/block/elevator.c b/block/elevator.c
> index 2bcbd8c..6c2a8ee 100644
> --- a/block/elevator.c
> +++ b/block/elevator.c
> @@ -184,7 +184,6 @@ static void elevator_release(struct kobject *kobj)
>  int elevator_init(struct request_queue *q, char *name)
>  {
>  	struct elevator_type *e = NULL;
> -	int err;
>  
>  	if (unlikely(q->elevator))
>  		return 0;
> @@ -222,8 +221,7 @@ int elevator_init(struct request_queue *q, char *name)
>  		}
>  	}
>  
> -	err = e->ops.elevator_init_fn(q, e);
> -	return 0;
> +	return e->ops.elevator_init_fn(q, e);
>  }
>  EXPORT_SYMBOL(elevator_init);