Re: linux-next: build failure after merge of the block tree

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	Ming Lei <ming.lei@canonical.com>
Newsgroups	linux.kernel
Subject	Re: linux-next: build failure after merge of the block tree
Date	Tue, 06 Oct 2015 09:30:05 +0200
Message-ID	<qguRf-7Jr-87@gated-at.bofh.it> (permalink)
References	<qgpya-8lJ-11@gated-at.bofh.it>
X-Original-To	Stephen Rothwell <sfr@canb.auug.org.au>
MIME-Version	1.0
X-Received	by 10.50.66.69 with SMTP id d5mr12738025igt.30.1444116020190; Tue, 06 Oct 2015 00:20:20 -0700 (PDT)
Content-Type	text/plain; charset=UTF-8
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	65
Organization	linux.* mail to news gateway
X-Original-Cc	Jens Axboe <axboe@kernel.dk>, "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Christoph Hellwig <hch@lst.de>
X-Original-Date	Tue, 6 Oct 2015 15:20:20 +0800
X-Original-Message-ID	<CACVXFVMgwv-6GAh6_dY3iVn=kJ36HPXoh-tx3BTvxtZNLvUg3Q@mail.gmail.com>
X-Original-References	<20151006124322.2a50698e@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1240207

Show key headers only | View raw

On Tue, Oct 6, 2015 at 9:43 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Jens,
>
> After merging the block tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/block/loop.c: In function 'lo_rw_aio_complete':
> drivers/block/loop.c:474:2: error: too few arguments to function 'blk_mq_complete_request'
>   blk_mq_complete_request(rq);
>   ^
> In file included from drivers/block/loop.h:14:0,
>                  from drivers/block/loop.c:79:
> include/linux/blk-mq.h:217:6: note: declared here
>  void blk_mq_complete_request(struct request *rq, int error);
>       ^
>
> Caused by commit
>
>   f4829a9b7a61 ("blk-mq: fix racy updates of rq->errors")
>
> from Linus' tree interacting with commit
>
>   bc07c10a3603 ("block: loop: support DIO & AIO")
>
> from the block tree.
>
> I added the this merge fix patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 6 Oct 2015 12:39:41 +1100
> Subject: [PATCH] blk-mq: merge fix for "fix racy updates of rq->errors"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/block/loop.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/block/loop.c b/drivers/block/loop.c
> index c692a3d812e4..9be61ad3163d 100644
> --- a/drivers/block/loop.c
> +++ b/drivers/block/loop.c
> @@ -470,8 +470,7 @@ static void lo_rw_aio_complete(struct kiocb *iocb, long ret, long ret2)
>         else if (ret < 0)
>                 ret = -EIO;
>
> -       rq->errors = ret;
> -       blk_mq_complete_request(rq);
> +       blk_mq_complete_request(rq, ret);

This merge fix looks fine, thanks.

>  }
>
>  static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd,
> --
> 2.5.1
>
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: build failure after merge of the block tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-10-06 03:50 +0200
  Re: linux-next: build failure after merge of the block tree Ming Lei <ming.lei@canonical.com> - 2015-10-06 09:30 +0200

csiph-web