From patchwork Wed Jan 16 02:35:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 10765347 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3919F6C5 for ; Wed, 16 Jan 2019 02:35:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 276962C5E8 for ; Wed, 16 Jan 2019 02:35:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1B6452E0EE; Wed, 16 Jan 2019 02:35:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ACCD52C5E8 for ; Wed, 16 Jan 2019 02:35:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728392AbfAPCf5 (ORCPT ); Tue, 15 Jan 2019 21:35:57 -0500 Received: from ozlabs.org ([203.11.71.1]:47649 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728309AbfAPCf4 (ORCPT ); Tue, 15 Jan 2019 21:35:56 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 43fWXn0g3Nz9s2P; Wed, 16 Jan 2019 13:35:53 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1547606153; bh=+ck+JoWQUW/h9liz+DG1vGHOmkRd9WBJf5LyPjAkj4I=; h=Date:From:To:Cc:Subject:From; b=YmygAP8gpzIBq/NQ89k0mjLi5l5AFH1tqCw3Uf0xB0fXcitCvBn4Ilg4ex+MZDVmX KjZplrTF0+gBsQ/RoWpRMzPq+55yIBSj0rvff1lGPUxlLBIZ+F60aA+BIuzAor5E0h BeaoPT/8lESkoZpaipYV2wKVT/vs5TgVy55uiXwtPRrWlADy+cauJfWa2cRaHbREF2 vH6zXSicGH32x0D5aNXwthVPFnvtiRI29P4qfxISGxtBMpdJM/hRNTn6iaulv94NBs cLWvRFeSLsEFY1rDtVxPvC2XJguSkLx8BQeUp4ZyTWWMYyT88eo9v8XMatLOs140zb HOdA4hCDuUEVQ== Date: Wed, 16 Jan 2019 13:35:52 +1100 From: Stephen Rothwell To: Jens Axboe , Anna Schumaker , Trond Myklebust , NFS Mailing List Cc: Linux Next Mailing List , Linux Kernel Mailing List , Ming Lei Subject: linux-next: build failure after merge of the block tree Message-ID: <20190116133552.37436b9c@canb.auug.org.au> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi all, After merging the block tree, today's linux-next build (arm multi_v7_defconfig) failed like this: net/sunrpc/xprtsock.c: In function 'xs_flush_bvec': net/sunrpc/xprtsock.c:390:2: error: implicit declaration of function 'for_each_bvec'; did you mean 'for_each_net'? [-Werror=implicit-function-declaration] for_each_bvec(bv, bvec, bi, bi) ^~~~~~~~~~~~~ for_each_net net/sunrpc/xprtsock.c:390:33: error: expected ';' before 'flush_dcache_page' for_each_bvec(bv, bvec, bi, bi) ^ ; flush_dcache_page(bv.bv_page); ~~~~~~~~~~~~~~~~~ Caused by commit f3effe4c1240 ("block: rename bvec helpers") interacting with commit 6a829eb8619f ("SUNRPC: Fix TCP receive code on archs with flush_dcache_page()") from the nfs-anna tree. [I love API changes :-(] I have applied the following merge fix patch: From: Stephen Rothwell Date: Wed, 16 Jan 2019 13:32:59 +1100 Subject: [PATCH] SUNRPC: merge fix for "block: rename bvec helpers" Signed-off-by: Stephen Rothwell --- net/sunrpc/xprtsock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 7754aa3e434f..47f29cc23f27 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -387,7 +387,7 @@ xs_flush_bvec(const struct bio_vec *bvec, size_t count, size_t seek) struct bio_vec bv; bvec_iter_advance(bvec, &bi, seek & PAGE_MASK); - for_each_bvec(bv, bvec, bi, bi) + for_each_segment(bv, bvec, bi, bi) flush_dcache_page(bv.bv_page); } #else