Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1510976
| From | Boris Brezillon <boris.brezillon@free-electrons.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH] UBI: fastmap: Fix add_vol() return value test in ubi_attach_fastmap() |
| Date | 2016-10-28 11:20 +0200 |
| Message-ID | <sxbup-6lx-5@gated-at.bofh.it> (permalink) |
| References | <sxbkJ-6ib-1@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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;
> }
>
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH] UBI: fastmap: Fix add_vol() return value test in ubi_attach_fastmap() Boris Brezillon <boris.brezillon@free-electrons.com> - 2016-10-28 11:10 +0200
Re: [PATCH] UBI: fastmap: Fix add_vol() return value test in ubi_attach_fastmap() Boris Brezillon <boris.brezillon@free-electrons.com> - 2016-10-28 11:20 +0200
Re: [PATCH] UBI: fastmap: Fix add_vol() return value test in ubi_attach_fastmap() Richard Weinberger <richard@nod.at> - 2016-10-28 11:20 +0200
csiph-web