| Message ID | 20210830221000.179369-16-mcgrof@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | block: third batch of add_disk() error handling conversions | expand |
On Mon, Aug 30, 2021 at 03:10:00PM -0700, 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/paride/pd.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c > index 500b89a4bdaf..226ed5c93b68 100644 > --- a/drivers/block/paride/pd.c > +++ b/drivers/block/paride/pd.c > @@ -938,8 +938,12 @@ static int pd_probe_drive(struct pd_unit *disk, int autoprobe, int port, > if (ret) > goto put_disk; > set_capacity(disk->gd, disk->capacity); > - add_disk(disk->gd); > + ret = add_disk(disk->gd); > + if (ret) > + goto cleanup_disk; > return 0; > +cleanup_disk: > + blk_cleanup_disk(&disk); This should be blk_cleanup_disk(disk->gd); Will fix up in my v2. Luis
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c index 500b89a4bdaf..226ed5c93b68 100644 --- a/drivers/block/paride/pd.c +++ b/drivers/block/paride/pd.c @@ -938,8 +938,12 @@ static int pd_probe_drive(struct pd_unit *disk, int autoprobe, int port, if (ret) goto put_disk; set_capacity(disk->gd, disk->capacity); - add_disk(disk->gd); + ret = add_disk(disk->gd); + if (ret) + goto cleanup_disk; return 0; +cleanup_disk: + blk_cleanup_disk(&disk); put_disk: put_disk(p); disk->gd = NULL;
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/paride/pd.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)