From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Roger Willcocks <roger@filmlight.ltd.uk>
Cc: Jens Axboe <axboe@kernel.dk>, David Jeffery <djeffery@redhat.com>,
linux-kernel@vger.kernel.org, xfs@oss.sgi.com,
Ben Myers <bpm@sgi.com>,
linux-next@vger.kernel.org, Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: manual merge of the block tree with the xfs tree
Date: Wed, 2 Sep 2015 23:03:42 +1000 [thread overview]
Message-ID: <20150902230342.125e23ce@canb.auug.org.au> (raw)
In-Reply-To: <C57DF728-E46C-433C-AA9D-209557D795E2@filmlight.ltd.uk>
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
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2015-09-02 13:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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
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=20150902230342.125e23ce@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=axboe@kernel.dk \
--cc=bpm@sgi.com \
--cc=djeffery@redhat.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=roger@filmlight.ltd.uk \
--cc=xfs@oss.sgi.com \
/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