From: Boris Brezillon <boris.brezillon@free-electrons.com>
To: Artem Bityutskiy <dedekind1@gmail.com>,
Richard Weinberger <richard@nod.at>
Cc: David Woodhouse <dwmw2@infradead.org>,
Brian Norris <computersforpeace@gmail.com>,
linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] UBI: fastmap: Fix add_vol() return value test in ubi_attach_fastmap()
Date: Fri, 28 Oct 2016 11:12:10 +0200 [thread overview]
Message-ID: <20161028111210.4515249a@bbrezillon> (raw)
In-Reply-To: <1477645724-17654-1-git-send-email-boris.brezillon@free-electrons.com>
On Fri, 28 Oct 2016 11:08:44 +0200
Boris Brezillon <boris.brezillon@free-electrons.com> wrote:
> Commit e96a8a3bb671 ("UBI: Fastmap: Do not add vol if it already
> exists") introduced a bug by changing the possible error codes returned
> by add_vol():
> - this functions no longer returns NULL in case of allocation failure
^ function
> but return ERR_PTR(-ENOMEM)
> - when a duplicate entry in the volume RB tree is found it returns
> ERR_PTR(-EEXIST) instead of ERR_PTR(-EINVAL)
>
> Fix the tests done of add_vol() return value accordingly.
"Fix the tests done on add_vol() return val to match this new behavior."
Do you want me to send a new version fixing the commit message?
>
> Fixes: e96a8a3bb671 ("UBI: Fastmap: Do not add vol if it already exists")
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Acked-by: Sheng Yong <shengyong1@huawei.com>
> ---
> drivers/mtd/ubi/fastmap.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
> index d6384d965788..eb39c44726e3 100644
> --- a/drivers/mtd/ubi/fastmap.c
> +++ b/drivers/mtd/ubi/fastmap.c
> @@ -707,11 +707,11 @@ static int ubi_attach_fastmap(struct ubi_device *ubi,
> fmvhdr->vol_type,
> be32_to_cpu(fmvhdr->last_eb_bytes));
>
> - if (!av)
> - goto fail_bad;
> - if (PTR_ERR(av) == -EINVAL) {
> - ubi_err(ubi, "volume (ID %i) already exists",
> - fmvhdr->vol_id);
> + if (IS_ERR(av)) {
> + if (PTR_ERR(av) == -EEXIST)
> + ubi_err(ubi, "volume (ID %i) already exists",
> + fmvhdr->vol_id);
> +
> goto fail_bad;
> }
>
next prev parent reply other threads:[~2016-10-28 9:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-28 9:08 [PATCH] UBI: fastmap: Fix add_vol() return value test in ubi_attach_fastmap() Boris Brezillon
2016-10-28 9:12 ` Boris Brezillon [this message]
2016-10-28 9:14 ` Richard Weinberger
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=20161028111210.4515249a@bbrezillon \
--to=boris.brezillon@free-electrons.com \
--cc=computersforpeace@gmail.com \
--cc=dedekind1@gmail.com \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=richard@nod.at \
/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