From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA60EC43464 for ; Mon, 21 Sep 2020 09:50:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9B311216C4 for ; Mon, 21 Sep 2020 09:50:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726470AbgIUJui (ORCPT ); Mon, 21 Sep 2020 05:50:38 -0400 Received: from mx2.suse.de ([195.135.220.15]:57642 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726384AbgIUJui (ORCPT ); Mon, 21 Sep 2020 05:50:38 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 42C96AF0B; Mon, 21 Sep 2020 09:51:12 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id DE1BB1E12E1; Mon, 21 Sep 2020 11:50:35 +0200 (CEST) Date: Mon, 21 Sep 2020 11:50:35 +0200 From: Jan Kara To: Greg KH Cc: Naresh Kamboju , Stuart Little , Dan Williams , Vishal Verma , Dave Jiang , linux-nvdimm@lists.01.org, kernel list , linux- stable , Adrian Huang , Mike Snitzer , dm-devel@redhat.com, Ira Weiny , mpatocka@redhat.com, lkft-triage@lists.linaro.org, Jan Kara Subject: Re: PROBLEM: 5.9.0-rc6 fails =?utf-8?Q?to_?= =?utf-8?Q?compile_due_to_'redefinition_of_=E2=80=98dax=5Fsupported?= =?utf-8?B?4oCZJw==?= Message-ID: <20200921095035.GC5862@quack2.suse.cz> References: <20200921010359.GO3027113@arch-chirva.localdomain> <20200921073218.GA3142611@kroah.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="CE+1k2dSO48ffgeK" Content-Disposition: inline In-Reply-To: <20200921073218.GA3142611@kroah.com> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --CE+1k2dSO48ffgeK Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon 21-09-20 09:32:18, Greg KH wrote: > On Mon, Sep 21, 2020 at 11:34:17AM +0530, Naresh Kamboju wrote: > > On Mon, 21 Sep 2020 at 06:34, Stuart Little wrote: > > > > > > I am trying to compile for an x86_64 machine (Intel(R) Core(TM) i7-7500U CPU @ 2.70GHz). The config file I am currently using is at > > > > > > https://termbin.com/xin7 > > > > > > The build for 5.9.0-rc6 fails with the following errors: > > > > > > > arm and mips allmodconfig build breaks due to this error. > > all my local builds are breaking now too with this :( > > Was there a proposed patch anywhere for this? Attached patch should fix the build breakage. I'm sorry for that. Honza -- Jan Kara SUSE Labs, CR --CE+1k2dSO48ffgeK Content-Type: text/x-patch; charset=us-ascii Content-Disposition: attachment; filename="0001-dax-Fix-compilation-for-CONFIG_DAX-CONFIG_FS_DAX.patch" >From 8b8c7d6148bc1bab3cf88cac49038a05db7dd938 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Mon, 21 Sep 2020 11:33:23 +0200 Subject: [PATCH] dax: Fix compilation for CONFIG_DAX && !CONFIG_FS_DAX dax_supported() is defined whenever CONFIG_DAX is enabled. So dummy implementation should be defined only in !CONFIG_DAX case, not in !CONFIG_FS_DAX case. Fixes: e2ec51282545 ("dm: Call proper helper to determine dax support") Cc: Reported-by: Geert Uytterhoeven Reported-by: Naresh Kamboju Signed-off-by: Jan Kara --- include/linux/dax.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/include/linux/dax.h b/include/linux/dax.h index 497031392e0a..43b39ab9de1a 100644 --- a/include/linux/dax.h +++ b/include/linux/dax.h @@ -58,6 +58,8 @@ static inline void set_dax_synchronous(struct dax_device *dax_dev) { __set_dax_synchronous(dax_dev); } +bool dax_supported(struct dax_device *dax_dev, struct block_device *bdev, + int blocksize, sector_t start, sector_t len); /* * Check if given mapping is supported by the file / underlying device. */ @@ -104,6 +106,12 @@ static inline bool dax_synchronous(struct dax_device *dax_dev) static inline void set_dax_synchronous(struct dax_device *dax_dev) { } +static inline bool dax_supported(struct dax_device *dax_dev, + struct block_device *bdev, int blocksize, sector_t start, + sector_t len) +{ + return false; +} static inline bool daxdev_mapping_supported(struct vm_area_struct *vma, struct dax_device *dax_dev) { @@ -130,8 +138,6 @@ static inline bool generic_fsdax_supported(struct dax_device *dax_dev, return __generic_fsdax_supported(dax_dev, bdev, blocksize, start, sectors); } -bool dax_supported(struct dax_device *dax_dev, struct block_device *bdev, - int blocksize, sector_t start, sector_t len); static inline void fs_put_dax(struct dax_device *dax_dev) { @@ -159,13 +165,6 @@ static inline bool generic_fsdax_supported(struct dax_device *dax_dev, return false; } -static inline bool dax_supported(struct dax_device *dax_dev, - struct block_device *bdev, int blocksize, sector_t start, - sector_t len) -{ - return false; -} - static inline void fs_put_dax(struct dax_device *dax_dev) { } -- 2.16.4 --CE+1k2dSO48ffgeK--