2021-05-12 07:03:22

by Luis Chamberlain

Subject: [PATCH v1 6/8] loop: add error handling support for add_disk()

We never checked for errors on add_disk() as this function
returned void. Now that this is fixed, use the shiny new
error handling.

Signed-off-by: Luis Chamberlain <[email protected]>
---
drivers/block/loop.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index d58d68f3c7cd..a22d8c985bf3 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -2170,10 +2170,15 @@ static int loop_add(struct loop_device **l, int i)
disk->private_data = lo;
disk->queue = lo->lo_queue;
sprintf(disk->disk_name, "loop%d", i);
- add_disk(disk);
+ err = add_disk(disk);
+ if (err)
+ goto out_put_disk;
+
*l = lo;
return lo->lo_number;

+out_put_disk:
+ put_disk(lo->lo_disk);
out_free_queue:
blk_cleanup_queue(lo->lo_queue);
out_cleanup_tags:
--
2.30.2

2021-05-12 15:41:25

by Hannes Reinecke

Subject: Re: [PATCH v1 6/8] loop: add error handling support for add_disk()

On 5/12/21 8:46 AM, Luis Chamberlain wrote:
> We never checked for errors on add_disk() as this function
> returned void. Now that this is fixed, use the shiny new
> error handling.
>
> Signed-off-by: Luis Chamberlain <[email protected]>
> ---
> drivers/block/loop.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/block/loop.c b/drivers/block/loop.c
> index d58d68f3c7cd..a22d8c985bf3 100644
> --- a/drivers/block/loop.c
> +++ b/drivers/block/loop.c
> @@ -2170,10 +2170,15 @@ static int loop_add(struct loop_device **l, int i)
> disk->private_data = lo;
> disk->queue = lo->lo_queue;
> sprintf(disk->disk_name, "loop%d", i);
> - add_disk(disk);
> + err = add_disk(disk);
> + if (err)
> + goto out_put_disk;
> +
> *l = lo;
> return lo->lo_number;
>
> +out_put_disk:
> + put_disk(lo->lo_disk);
> out_free_queue:
> blk_cleanup_queue(lo->lo_queue);
> out_cleanup_tags:
>
Reviewed-by: Hannes Reinecke <[email protected]>

Cheers,

Hannes
--
Dr. Hannes Reinecke Kernel Storage Architect
[email protected] +49 911 74053 688
SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer