Skip to content

Commit

Permalink
bcache: add error handling support for add_disk()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
mcgrof authored and intel-lab-lkp committed Jul 15, 2021
1 parent 20f940b commit 75d7d32
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions drivers/md/bcache/super.c
Expand Up @@ -1077,7 +1077,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
Expand Down Expand Up @@ -1526,10 +1528,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);
Expand All @@ -1543,9 +1546,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");
Expand All @@ -1559,7 +1565,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)
Expand Down

0 comments on commit 75d7d32

Please sign in to comment.