From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752853AbbIBNey (ORCPT ); Wed, 2 Sep 2015 09:34:54 -0400 Received: from c.mx.filmlight.ltd.uk ([54.76.112.217]:60166 "EHLO c.mx.filmlight.ltd.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750856AbbIBNex (ORCPT ); Wed, 2 Sep 2015 09:34:53 -0400 Subject: Re: linux-next: manual merge of the block tree with the xfs tree From: Roger Willcocks To: Stephen Rothwell Cc: Jens Axboe , David Jeffery , linux-kernel@vger.kernel.org, xfs@oss.sgi.com, Ben Myers , linux-next@vger.kernel.org, Christoph Hellwig In-Reply-To: <20150902230342.125e23ce@canb.auug.org.au> References: <20150902121649.7a686b6c@canb.auug.org.au> <20150902230342.125e23ce@canb.auug.org.au> Content-Type: text/plain Date: Wed, 02 Sep 2015 14:34:51 +0100 Message-Id: <1441200891.17400.1277.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.12.3 (2.12.3-19.el5) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 wrote: > > > > On 2 Sep 2015, at 03:16, Stephen Rothwell 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