| Message ID | 20210827191809.3118103-3-mcgrof@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | block: first batch of add_disk() error handling conversions | expand |
On 8/28/21 3:18 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. > > This driver doesn't do any unwinding with blk_cleanup_disk() > even on errors after add_disk() and so we follow that > tradition. > > Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> Acked-by: Coly Li <colyli@suse.de> Thanks. > --- > drivers/md/bcache/super.c | 17 ++++++++++++----- > 1 file changed, 12 insertions(+), 5 deletions(-) > > diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c > index f2874c77ff79..f0c32cdd6594 100644 > --- a/drivers/md/bcache/super.c > +++ b/drivers/md/bcache/super.c > @@ -1082,7 +1082,9 @@ int bch_cached_dev_run(struct cached_dev *dc) > closure_sync(&cl); > } > > - add_disk(d->disk); > + ret = add_disk(d->disk); > + if (ret) > + goto out; > bd_link_disk_holder(dc->bdev, dc->disk.disk); > /* > * won't show up in the uevent file, use udevadm monitor -e instead > @@ -1534,10 +1536,11 @@ static void flash_dev_flush(struct closure *cl) > > static int flash_dev_run(struct cache_set *c, struct uuid_entry *u) > { > + int err = -ENOMEM; > struct bcache_device *d = kzalloc(sizeof(struct bcache_device), > GFP_KERNEL); > if (!d) > - return -ENOMEM; > + goto err_ret; > > closure_init(&d->cl, NULL); > set_closure_fn(&d->cl, flash_dev_flush, system_wq); > @@ -1551,9 +1554,12 @@ static int flash_dev_run(struct cache_set *c, struct uuid_entry *u) > bcache_device_attach(d, c, u - c->uuids); > bch_sectors_dirty_init(d); > bch_flash_dev_request_init(d); > - add_disk(d->disk); > + err = add_disk(d->disk); > + if (err) > + goto err; > > - if (kobject_add(&d->kobj, &disk_to_dev(d->disk)->kobj, "bcache")) > + err = kobject_add(&d->kobj, &disk_to_dev(d->disk)->kobj, "bcache"); > + if (err) > goto err; > > bcache_device_link(d, c, "volume"); > @@ -1567,7 +1573,8 @@ static int flash_dev_run(struct cache_set *c, struct uuid_entry *u) > return 0; > err: > kobject_put(&d->kobj); > - return -ENOMEM; > +err_ret: > + return err; > } > > static int flash_devs_run(struct cache_set *c)
diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index f2874c77ff79..f0c32cdd6594 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -1082,7 +1082,9 @@ int bch_cached_dev_run(struct cached_dev *dc) closure_sync(&cl); } - add_disk(d->disk); + ret = add_disk(d->disk); + if (ret) + goto out; bd_link_disk_holder(dc->bdev, dc->disk.disk); /* * won't show up in the uevent file, use udevadm monitor -e instead @@ -1534,10 +1536,11 @@ static void flash_dev_flush(struct closure *cl) static int flash_dev_run(struct cache_set *c, struct uuid_entry *u) { + int err = -ENOMEM; struct bcache_device *d = kzalloc(sizeof(struct bcache_device), GFP_KERNEL); if (!d) - return -ENOMEM; + goto err_ret; closure_init(&d->cl, NULL); set_closure_fn(&d->cl, flash_dev_flush, system_wq); @@ -1551,9 +1554,12 @@ static int flash_dev_run(struct cache_set *c, struct uuid_entry *u) bcache_device_attach(d, c, u - c->uuids); bch_sectors_dirty_init(d); bch_flash_dev_request_init(d); - add_disk(d->disk); + err = add_disk(d->disk); + if (err) + goto err; - if (kobject_add(&d->kobj, &disk_to_dev(d->disk)->kobj, "bcache")) + err = kobject_add(&d->kobj, &disk_to_dev(d->disk)->kobj, "bcache"); + if (err) goto err; bcache_device_link(d, c, "volume"); @@ -1567,7 +1573,8 @@ static int flash_dev_run(struct cache_set *c, struct uuid_entry *u) return 0; err: kobject_put(&d->kobj); - return -ENOMEM; +err_ret: + return err; } static int flash_devs_run(struct cache_set *c)
We never checked for errors on add_disk() as this function returned void. Now that this is fixed, use the shiny new error handling. This driver doesn't do any unwinding with blk_cleanup_disk() even on errors after add_disk() and so we follow that tradition. Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> --- drivers/md/bcache/super.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)