From: Coly Li <colyli@suse.de>
To: Chao Yu <chao@kernel.org>
Cc: linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org,
Chao Yu <yuchao0@huawei.com>
Subject: Re: [PATCH] bcache: fix error info in register_bcache()
Date: Thu, 20 May 2021 00:43:36 +0800 [thread overview]
Message-ID: <8c9f1ee7-553c-d795-40c2-7de2e0a0c4ac@suse.de> (raw)
In-Reply-To: <20210519132823.14920-1-chao@kernel.org>
On 5/19/21 9:28 PM, Chao Yu wrote:
> 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>
Will add it to my test queue.
Thanks.
Coly Li
> ---
> 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 bea8c4429ae8..0a20ccf5a1db 100644
> --- a/drivers/md/bcache/super.c
> +++ b/drivers/md/bcache/super.c
> @@ -2620,8 +2620,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);
> @@ -2632,11 +2635,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;
> }
>
>
prev parent reply other threads:[~2021-05-19 16:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-19 13:28 [PATCH] bcache: fix error info in register_bcache() Chao Yu
2021-05-19 16:43 ` Coly Li [this message]
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=8c9f1ee7-553c-d795-40c2-7de2e0a0c4ac@suse.de \
--to=colyli@suse.de \
--cc=chao@kernel.org \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-kernel@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;
as well as URLs for NNTP newsgroup(s).