Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1217277 > unrolled thread

linux-next: manual merge of the block tree with the xfs tree

Back to article view | Back to linux.kernel

Contents

  linux-next: manual merge of the block tree with the xfs tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-09-02 04:20 +0200
    Re: linux-next: manual merge of the block tree with the xfs tree Roger Willcocks <roger@filmlight.ltd.uk> - 2015-09-02 12:00 +0200
      Re: linux-next: manual merge of the block tree with the xfs tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-09-02 15:10 +0200
        Re: linux-next: manual merge of the block tree with the xfs tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-09-02 15:40 +0200
        Re: linux-next: manual merge of the block tree with the xfs tree Roger Willcocks <roger@filmlight.ltd.uk> - 2015-09-02 15:40 +0200

#1217277 — linux-next: manual merge of the block tree with the xfs tree

Hi Jens,

Today's linux-next merge of the block tree got a conflict in:

  fs/xfs/xfs_aops.c

between commit:

  c9eb256eda44 ("xfs: return errors from partial I/O failures to files")

from the xfs tree and commit:

  4246a0b63bd8 ("block: add a bi_error field to struct bio")

from the block tree.

I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/xfs/xfs_aops.c
index c8637073ef25,c77499bcbd7a..000000000000
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@@ -354,8 -355,7 +353,8 @@@ xfs_end_bio
  {
  	xfs_ioend_t		*ioend = bio->bi_private;
  
- 	if (!ioend->io_error && !test_bit(BIO_UPTODATE, &bio->bi_flags))
- 		ioend->io_error = error;
 -	ioend->io_error = bio->bi_error;
++	if (!ioend->io_error)
++		ioend->io_error = bio->bi_error;
  
  	/* Toss bio and pass work off to an xfsdatad thread */
  	bio->bi_private = NULL;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1217467

On 2 Sep 2015, at 03:16, Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Jens,
> 
> Today's linux-next merge of the block tree got a conflict in:
> 
>  fs/xfs/xfs_aops.c
> 
> between commit:
> 
>  c9eb256eda44 ("xfs: return errors from partial I/O failures to files")
> 
> from the xfs tree and commit:
> 
>  4246a0b63bd8 ("block: add a bi_error field to struct bio")
> 
> from the block tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary
> (no action is required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc fs/xfs/xfs_aops.c
> index c8637073ef25,c77499bcbd7a..000000000000
> --- a/fs/xfs/xfs_aops.c
> +++ b/fs/xfs/xfs_aops.c
> @@@ -354,8 -355,7 +353,8 @@@ xfs_end_bio
>  {
>  	xfs_ioend_t		*ioend = bio->bi_private;
> 
> - 	if (!ioend->io_error && !test_bit(BIO_UPTODATE, &bio->bi_flags))
> - 		ioend->io_error = error;
> -	ioend->io_error = bio->bi_error;
> ++	if (!ioend->io_error)
> ++		ioend->io_error = bio->bi_error;
> 
>  	/* Toss bio and pass work off to an xfsdatad thread */
>  	bio->bi_private = NULL;
> 
> 

This is incorrect; it can clear an earlier error status. It should probably read:

 	if (!ioend->io_error && bio->bi_error)
 		ioend->io_error = bio->bi_error;

—
Roger

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1217590

Hi Roger,

On Wed, 2 Sep 2015 10:45:29 +0100 Roger Willcocks <roger@filmlight.ltd.uk> wrote:
>
> On 2 Sep 2015, at 03:16, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Today's linux-next merge of the block tree got a conflict in:
> > 
> >  fs/xfs/xfs_aops.c
> > 
> > between commit:
> > 
> >  c9eb256eda44 ("xfs: return errors from partial I/O failures to files")
> > 
> > from the xfs tree and commit:
> > 
> >  4246a0b63bd8 ("block: add a bi_error field to struct bio")
> > 
> > from the block tree.
> > 
> > I fixed it up (I think - see below) and can carry the fix as necessary
> > (no action is required).
> > 
> > -- 
> > Cheers,
> > Stephen Rothwell                    sfr@canb.auug.org.au
> > 
> > diff --cc fs/xfs/xfs_aops.c
> > index c8637073ef25,c77499bcbd7a..000000000000
> > --- a/fs/xfs/xfs_aops.c
> > +++ b/fs/xfs/xfs_aops.c
> > @@@ -354,8 -355,7 +353,8 @@@ xfs_end_bio
> >  {
> >  	xfs_ioend_t		*ioend = bio->bi_private;
> > 
> > - 	if (!ioend->io_error && !test_bit(BIO_UPTODATE, &bio->bi_flags))
> > - 		ioend->io_error = error;
> > -	ioend->io_error = bio->bi_error;
> > ++	if (!ioend->io_error)
> > ++		ioend->io_error = bio->bi_error;
> > 
> >  	/* Toss bio and pass work off to an xfsdatad thread */
> >  	bio->bi_private = NULL;
> > 
> > 
> 
> This is incorrect; it can clear an earlier error status. It should probably read:
> 
>  	if (!ioend->io_error && bio->bi_error)
>  		ioend->io_error = bio->bi_error;

Thanks, I will use that from tomorrow.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1217606

Hi Roger,

On Wed, 02 Sep 2015 14:34:51 +0100 Roger Willcocks <roger@filmlight.ltd.uk> wrote:
>
> Huh, now I've had my coffee, that extra check doesn't add anything.
> (There's no harm done in assigning zero to io_error if it's already
> zero.) Apologies for the noise.

That's OK, my excuse is being to far at the other end of the day ...

I actually now remember thinking the same thing at the time I did it :-)
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1217607

On Wed, 2015-09-02 at 23:03 +1000, Stephen Rothwell wrote:
> Hi Roger,
> 
> On Wed, 2 Sep 2015 10:45:29 +0100 Roger Willcocks <roger@filmlight.ltd.uk> wrote:
> >
> > On 2 Sep 2015, at 03:16, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 

> > > ++	if (!ioend->io_error)
> > > ++		ioend->io_error = bio->bi_error;

> > 
> > This is incorrect; it can clear an earlier error status. It should probably read:
> > 
> >  	if (!ioend->io_error && bio->bi_error)
> >  		ioend->io_error = bio->bi_error;
> 
> Thanks, I will use that from tomorrow.
> 

Huh, now I've had my coffee, that extra check doesn't add anything.
(There's no harm done in assigning zero to io_error if it's already
zero.) Apologies for the noise.

-- 
Roger Willcocks <roger@filmlight.ltd.uk>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web