* linux-next: manual merge of the block tree with the xfs tree
@ 2015-09-02 2:16 Stephen Rothwell
2015-09-02 9:45 ` Roger Willcocks
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2015-09-02 2:16 UTC (permalink / raw)
To: Jens Axboe, Ben Myers, David Chinner, xfs
Cc: linux-next, linux-kernel, Christoph Hellwig, David Jeffery
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;
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the block tree with the xfs tree
2015-09-02 2:16 linux-next: manual merge of the block tree with the xfs tree Stephen Rothwell
@ 2015-09-02 9:45 ` Roger Willcocks
2015-09-02 13:03 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Roger Willcocks @ 2015-09-02 9:45 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jens Axboe, David Jeffery, linux-kernel, xfs, Ben Myers,
linux-next, Roger Willcocks, Christoph Hellwig
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
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the block tree with the xfs tree
2015-09-02 9:45 ` Roger Willcocks
@ 2015-09-02 13:03 ` Stephen Rothwell
2015-09-02 13:34 ` Roger Willcocks
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2015-09-02 13:03 UTC (permalink / raw)
To: Roger Willcocks
Cc: Jens Axboe, Ben Myers, David Chinner, xfs, David Jeffery,
linux-next, linux-kernel, Christoph Hellwig
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the block tree with the xfs tree
2015-09-02 13:03 ` Stephen Rothwell
@ 2015-09-02 13:34 ` Roger Willcocks
2015-09-02 13:37 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Roger Willcocks @ 2015-09-02 13:34 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jens Axboe, David Jeffery, linux-kernel, xfs, Ben Myers,
linux-next, Christoph Hellwig
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>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the block tree with the xfs tree
2015-09-02 13:34 ` Roger Willcocks
@ 2015-09-02 13:37 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2015-09-02 13:37 UTC (permalink / raw)
To: Roger Willcocks
Cc: Jens Axboe, David Jeffery, linux-kernel, xfs, Ben Myers,
linux-next, Christoph Hellwig
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the block tree with the xfs tree
@ 2019-07-03 3:19 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2019-07-03 3:19 UTC (permalink / raw)
To: Jens Axboe, Darrick J. Wong, David Chinner, linux-xfs
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Ming Lei,
Christoph Hellwig
[-- Attachment #1: Type: text/plain, Size: 1182 bytes --]
Hi all,
Today's linux-next merge of the block tree got a conflict in:
fs/xfs/xfs_aops.c
between commit:
a24737359667 ("xfs: simplify xfs_chain_bio")
from the xfs tree and commit:
79d08f89bb1b ("block: fix .bi_size overflow")
from the block tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc fs/xfs/xfs_aops.c
index bb769d9c5250,11f703d4a605..000000000000
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@@ -790,8 -782,8 +790,8 @@@ xfs_add_to_ioend
atomic_inc(&iop->write_count);
if (!merged) {
- if (bio_full(wpc->ioend->io_bio))
+ if (bio_full(wpc->ioend->io_bio, len))
- xfs_chain_bio(wpc->ioend, wbc, bdev, sector);
+ wpc->ioend->io_bio = xfs_chain_bio(wpc->ioend->io_bio);
bio_add_page(wpc->ioend->io_bio, page, len, poff);
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-07-03 3:19 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-02 2:16 linux-next: manual merge of the block tree with the xfs tree Stephen Rothwell
2015-09-02 9:45 ` Roger Willcocks
2015-09-02 13:03 ` Stephen Rothwell
2015-09-02 13:34 ` Roger Willcocks
2015-09-02 13:37 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2019-07-03 3:19 Stephen Rothwell
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).