diff options
| author |   Chao Yu <yuchao0@huawei.com> | 2021-10-20 22:38:07 +0800 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2021-10-20 08:40:54 -0600 |
| commit | d55f7cb2e5c053010d2b527494da9bbb722a78ba (patch) | |
| tree | 9a5e6cd38a8fec1bea2acc91c16845849aed06a6 /drivers/md | |
| parent | bcache: reserve never used bits from bkey.high (diff) | |
| download | linux-dev-d55f7cb2e5c053010d2b527494da9bbb722a78ba.tar.xz linux-dev-d55f7cb2e5c053010d2b527494da9bbb722a78ba.zip | |
bcache: fix error info in register_bcache()
In register_bcache(), there are several cases we didn't set
correct error info (return value and/or error message):
- if kzalloc() fails, it needs to return ENOMEM and print
"cannot allocate memory";
- if register_cache() fails, it's better to propagate its
return value rather than using default EINVAL.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Coly Li <colyli@suse.de>
Link: https://lore.kernel.org/r/20211020143812.6403-4-colyli@suse.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/bcache/super.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index 330d6c167265..62b0140b0a73 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -2617,8 +2617,11 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr, if (SB_IS_BDEV(sb)) { struct cached_dev *dc = kzalloc(sizeof(*dc), GFP_KERNEL); - if (!dc) + if (!dc) { + ret = -ENOMEM; + err = "cannot allocate memory"; goto out_put_sb_page; + } mutex_lock(&bch_register_lock); ret = register_bdev(sb, sb_disk, bdev, dc); @@ -2629,11 +2632,15 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr, } else { struct cache *ca = kzalloc(sizeof(*ca), GFP_KERNEL); - if (!ca) + if (!ca) { + ret = -ENOMEM; + err = "cannot allocate memory"; goto out_put_sb_page; + } /* blkdev_put() will be called in bch_cache_release() */ - if (register_cache(sb, sb_disk, bdev, ca) != 0) + ret = register_cache(sb, sb_disk, bdev, ca); + if (ret) goto out_free_sb; } |