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

[Roger Willcocks]

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 at filmlight.ltd.uk> wrote:
> >
> > On 2 Sep 2015, at 03:16, Stephen Rothwell <sfr at 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 at filmlight.ltd.uk>