From: Coly Li <colyli@suse.de>
To: axboe@kernel.dk
Cc: linux-bcache@vger.kernel.org, linux-block@vger.kernel.org,
Chao Yu <yuchao0@huawei.com>, Hannes Reinecke <hare@suse.de>,
Coly Li <colyli@suse.de>
Subject: [PATCH 3/8] bcache: fix error info in register_bcache()
Date: Wed, 20 Oct 2021 22:38:07 +0800 [thread overview]
Message-ID: <20211020143812.6403-4-colyli@suse.de> (raw)
In-Reply-To: <20211020143812.6403-1-colyli@suse.de>
From: Chao Yu <yuchao0@huawei.com>
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>
---
drivers/md/bcache/super.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index ab64b7762b6e..6bc5ee42a059 100644
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -2613,8 +2613,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);
@@ -2625,11 +2628,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;
}
--
2.31.1
next prev parent reply other threads:[~2021-10-20 14:38 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-20 14:38 [PATCH 0/8] bcache patches for Linux v5.16 (first wave) Coly Li
2021-10-20 14:38 ` [PATCH 1/8] md: bcache: Fix spelling of 'acquire' Coly Li
2021-10-20 14:38 ` [PATCH 2/8] bcache: reserve never used bits from bkey.high Coly Li
2021-10-20 14:38 ` Coly Li [this message]
2021-10-20 14:38 ` [PATCH 4/8] bcache: move calc_cached_dev_sectors to proper place on backing device detach Coly Li
2021-10-20 14:38 ` [PATCH 5/8] bcache: remove the cache_dev_name field from struct cache Coly Li
2021-10-20 14:38 ` [PATCH 6/8] bcache: remove the backing_dev_name field from struct cached_dev Coly Li
2021-10-20 14:38 ` [PATCH 7/8] bcache: use bvec_kmap_local in bch_data_verify Coly Li
2021-10-20 14:38 ` [PATCH 8/8] bcache: remove bch_crc64_update Coly Li
2021-10-20 14:41 ` [PATCH 0/8] bcache patches for Linux v5.16 (first wave) Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211020143812.6403-4-colyli@suse.de \
--to=colyli@suse.de \
--cc=axboe@kernel.dk \
--cc=hare@suse.de \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=yuchao0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox