mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Roberto Nibali <rnibali@gmail.com>
To: Sascha Hauer <s.hauer@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/2] block: propagate error code from block_get
Date: Thu, 31 May 2012 14:45:49 +0200	[thread overview]
Message-ID: <CAONxwYNJuqiQh9LRkvSsQxExboDrpYQ0HLF9-REf9yLu507MEw@mail.gmail.com> (raw)
In-Reply-To: <1338355875-18830-1-git-send-email-s.hauer@pengutronix.de>


[-- Attachment #1.1: Type: text/plain, Size: 3680 bytes --]

Hi Sascha

On Wed, May 30, 2012 at 7:31 AM, Sascha Hauer <s.hauer@pengutronix.de>wrote:

> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  common/block.c |   26 +++++++++++++-------------
>  1 file changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/common/block.c b/common/block.c
> index 4253fc4..437dc95 100644
> --- a/common/block.c
> +++ b/common/block.c
> @@ -161,7 +161,7 @@ static void *block_get(struct block_device *blk, int
> block)
>        int ret;
>
>        if (block >= blk->num_blocks)
> -               return NULL;
> +               return ERR_PTR(-ENXIO);
>
>        outdata = block_get_cached(blk, block);
>        if (outdata)
> @@ -169,7 +169,7 @@ static void *block_get(struct block_device *blk, int
> block)
>
>        ret = block_cache(blk, block);
>        if (ret)
> -               return NULL;
> +               return ERR_PTR(ret);
>
>        outdata = block_get_cached(blk, block);
>        if (!outdata)
> @@ -191,8 +191,8 @@ static ssize_t block_read(struct cdev *cdev, void
> *buf, size_t count,
>                size_t now = BLOCKSIZE(blk) - (offset & mask);
>                void *iobuf = block_get(blk, block);
>
> -               if (!iobuf)
> -                       return -EIO;
> +               if (IS_ERR(iobuf))
> +                       return PTR_ERR(iobuf);
>
>                now = min(count, now);
>
> @@ -207,8 +207,8 @@ static ssize_t block_read(struct cdev *cdev, void
> *buf, size_t count,
>        while (blocks) {
>                void *iobuf = block_get(blk, block);
>
> -               if (!iobuf)
> -                       return -EIO;
> +               if (IS_ERR(iobuf))
> +                       return PTR_ERR(iobuf);
>
>                memcpy(buf, iobuf, BLOCKSIZE(blk));
>                buf += BLOCKSIZE(blk);
> @@ -220,8 +220,8 @@ static ssize_t block_read(struct cdev *cdev, void
> *buf, size_t count,
>        if (count) {
>                void *iobuf = block_get(blk, block);
>
> -               if (!iobuf)
> -                       return -EIO;
> +               if (IS_ERR(iobuf))
> +                       return PTR_ERR(iobuf);
>
>                memcpy(buf, iobuf, count);
>        }
> @@ -244,7 +244,7 @@ static int block_put(struct block_device *blk, const
> void *buf, int block)
>                return -EINVAL;
>
>        data = block_get(blk, block);
> -       if (!data)
> +       if (IS_ERR(data))
>                BUG();
>
>        memcpy(data, buf, 1 << blk->blockbits);
> @@ -270,8 +270,8 @@ static ssize_t block_write(struct cdev *cdev, const
> void *buf, size_t count,
>
>                now = min(count, now);
>
> -               if (!iobuf)
> -                       return -EIO;
> +               if (IS_ERR(iobuf))
> +                       return PTR_ERR(iobuf);
>
>                memcpy(iobuf + (offset & mask), buf, now);
>                ret = block_put(blk, iobuf, block);
> @@ -299,8 +299,8 @@ static ssize_t block_write(struct cdev *cdev, const
> void *buf, size_t count,
>        if (count) {
>                void *iobuf = block_get(blk, block);
>
> -               if (!iobuf)
> -                       return -EIO;
> +               if (IS_ERR(iobuf))
> +                       return PTR_ERR(iobuf);
>
>                memcpy(iobuf, buf, count);
>                ret = block_put(blk, iobuf, block);
> --
> 1.7.10
>
>
Compile and run-time tested; results in a proper error message propagated
by the block layer:

imx-esdhc@imx-esdhc0: timeout 1
mci@mci0: Reading block 2560 failed with -110
block_cache: blk->ops->read returned -110

Therefore:

Tested-by: Roberto Nibali <rnibali@gmail.com>
Acked-by: Roberto Nibali <rnibali@gmail.com>

Cheers
Roberto

[-- Attachment #1.2: Type: text/html, Size: 4639 bytes --]

[-- Attachment #2: Type: text/plain, Size: 149 bytes --]

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      parent reply	other threads:[~2012-05-31 12:46 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-30  5:31 Sascha Hauer
2012-05-30  5:31 ` [PATCH 2/2] block: do not BUG() on failed block_get Sascha Hauer
2012-05-31 12:46   ` Roberto Nibali
2012-05-31 12:45 ` Roberto Nibali [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=CAONxwYNJuqiQh9LRkvSsQxExboDrpYQ0HLF9-REf9yLu507MEw@mail.gmail.com \
    --to=rnibali@gmail.com \
    --cc=barebox@lists.infradead.org \
    --cc=s.hauer@pengutronix.de \
    /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