From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754093Ab3KEDVP (ORCPT ); Mon, 4 Nov 2013 22:21:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46750 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751451Ab3KEDVO (ORCPT ); Mon, 4 Nov 2013 22:21:14 -0500 Date: Mon, 4 Nov 2013 22:20:54 -0500 From: Mike Snitzer To: Stephen Rothwell Cc: Alasdair G Kergon , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Kent Overstreet , Jens Axboe , Joe Thornber Subject: Re: linux-next: build failure after merge of the device-mapper tree Message-ID: <20131105032054.GA19421@redhat.com> References: <20131105135128.496b8b2f599d11f2d30ad70c@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20131105135128.496b8b2f599d11f2d30ad70c@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Nov 04 2013 at 9:51pm -0500, Stephen Rothwell wrote: > Hi all, > > After merging the device-mapper tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/md/dm-cache-target.c: In function 'bio_writes_complete_block': > drivers/md/dm-cache-target.c:1020:7: error: 'struct bio' has no member named 'bi_size' > (bio->bi_size == (cache->sectors_per_block << SECTOR_SHIFT)); > ^ > > Caused by commit 1bd270d800ec ("dm cache: promotion optimisation for > writes") interacting with commit ed2d2f9a8265 ("block: Abstract out bvec > iterator") from the block tree. > > I applied this fix up patch and can carry it as necessary: Hi Stephen, Yes that is needed, as is this (which begs the question: how should I be handling the fact that post-merge changes are needed? Especially since Linus will need the changes too): drivers/md/dm-cache-target.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/md/dm-cache-target.c b/drivers/md/dm-cache-target.c index a977d5c..52d7d75 100644 --- a/drivers/md/dm-cache-target.c +++ b/drivers/md/dm-cache-target.c @@ -85,6 +85,12 @@ static void dm_unhook_bio(struct dm_hook_info *h, struct bio *bio) { bio->bi_end_io = h->bi_end_io; bio->bi_private = h->bi_private; + + /* + * Must bump bi_remaining to allow bio to complete with + * restored bi_end_io. + */ + atomic_inc(&bio->bi_remaining); } /*----------------------------------------------------------------*/ @@ -746,12 +752,6 @@ static void writethrough_endio(struct bio *bio, int err) dm_unhook_bio(&pb->hook_info, bio); - /* - * Must bump bi_remaining to allow bio to complete with - * restored bi_end_io. - */ - atomic_inc(&bio->bi_remaining); - if (err) { bio_endio(bio, err); return;