| Message ID | 20210512064629.13899-7-mcgrof@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | block: add error handling for *add_disk*() | expand |
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 <mcgrof@kernel.org> > --- > 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 <hare@suse.de> Cheers, Hannes
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:
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 <mcgrof@kernel.org> --- drivers/block/loop.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)