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=-3.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no 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 E0E9DC33CA4 for ; Fri, 10 Jan 2020 11:04:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B86F9206ED for ; Fri, 10 Jan 2020 11:04:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RSWDEdl0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727634AbgAJLEB (ORCPT ); Fri, 10 Jan 2020 06:04:01 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:25584 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727682AbgAJLEA (ORCPT ); Fri, 10 Jan 2020 06:04:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578654239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ULOVTMVDqAaA1RLSX77fffpqFQaKmKj4WAvS8G6y3qE=; b=RSWDEdl0FrUWAjp7gQ0T6fu2Z8wqS52wP55fRbW8jhfxeeghdrwq9OH77NolGqjmf41WVI 9fLdbLdCQ4AiTc0FfNAb2+H2pMBBjKkFQPdPyhGNZ95j2AzfMAVRveW2BxRfQGFSUqdvBF OzhgY/CMJaLOd9SFb/RLKCTCVNfeqUw= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-330-plXWdyDbOmK94UsI72oAGA-1; Fri, 10 Jan 2020 06:03:57 -0500 X-MC-Unique: plXWdyDbOmK94UsI72oAGA-1 Received: by mail-wr1-f69.google.com with SMTP id f10so738985wro.14 for ; Fri, 10 Jan 2020 03:03:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=ULOVTMVDqAaA1RLSX77fffpqFQaKmKj4WAvS8G6y3qE=; b=nlK5zfs36mFz+qy+4Je8ABvjivQjpn0lYDsf/k9h0ieH5KoVGRdSRvSxJMErZUhiCK PhdgY7gx1FNTYzPrbPK1gtdzY/w1R22XfjEwX8kf6z19WCdaeQYj9OJoRps+WZjICwEq savH825vaFASSu7wqBSNDsjkoiMupFYWpL+dBOE+bPixLwDjQDYckhtWWZy3Q0eTRiEM WsMxmmfb423q5wF6nOZE60AHeev8rpEYtzSqstfpL5QqJkUZ891c2MOKjmJoFDK4z20m PrrmgHXypzbYWWAKFJ4i+5WVWDHg5bSyPnBUHhdQjnwm1opvMqT+jPw2D7/RK3LjOVOW zg8A== X-Gm-Message-State: APjAAAVtMUuWcrSHeiOAweLF5FoWRsCOYZHcVF94wq7YtShQ+tBuP10s Wkl283xe8ts6IGxPwrFGZgQ1Ny7YMTlyJJmC61+QKwDsyPpG1MsqxztZNBFcaJAUKxiy6uE5UhJ uQMM33brWHVp9koaiLqN8Kg== X-Received: by 2002:a05:600c:20f:: with SMTP id 15mr3632343wmi.128.1578654236393; Fri, 10 Jan 2020 03:03:56 -0800 (PST) X-Google-Smtp-Source: APXvYqwxiKRM13Xd1Qan5MRjTjamzFk3V0rFLzaLiX22VRyLN1pQimrtTB1j7dEj52V7YMsGG8cFTA== X-Received: by 2002:a05:600c:20f:: with SMTP id 15mr3632307wmi.128.1578654236076; Fri, 10 Jan 2020 03:03:56 -0800 (PST) Received: from orion ([213.175.37.12]) by smtp.gmail.com with ESMTPSA id v3sm1755346wru.32.2020.01.10.03.03.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2020 03:03:55 -0800 (PST) Date: Fri, 10 Jan 2020 12:03:53 +0100 From: Carlos Maiolino To: Stephen Rothwell Cc: Al Viro , Linux Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: build failure after merge of the vfs tree Message-ID: <20200110110353.klnooeqv4b6ipxid@orion> Mail-Followup-To: Carlos Maiolino , Stephen Rothwell , Al Viro , Linux Next Mailing List , Linux Kernel Mailing List References: <20200110175729.3b5d2338@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200110175729.3b5d2338@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Fri, Jan 10, 2020 at 05:57:29PM +1100, Stephen Rothwell wrote: > Hi all, > > After merging the vfs tree, today's linux-next build (x86_64 allnoconfig) > failed like this: > > fs/inode.c:1615:5: error: redefinition of 'bmap' > 1615 | int bmap(struct inode *inode, sector_t *block) > | ^~~~ > In file included from fs/inode.c:7: > include/linux/fs.h:2867:19: note: previous definition of 'bmap' was here > 2867 | static inline int bmap(struct inode *inode, sector_t *block) > | ^~~~ > Oh, no, that's not the same issue I thought, and the patch applied does have the dummy function. /me grabs more coffee... > --- > fs/inode.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/fs/inode.c b/fs/inode.c > index 9f894b25af2b..590f36daa006 100644 > --- a/fs/inode.c > +++ b/fs/inode.c > @@ -1598,6 +1598,7 @@ void iput(struct inode *inode) > } > EXPORT_SYMBOL(iput); > > +#ifdef CONFIG_BLOCK > /** > * bmap - find a block number in a file > * @inode: inode owning the block number being requested > @@ -1621,6 +1622,7 @@ int bmap(struct inode *inode, sector_t *block) > return 0; > } > EXPORT_SYMBOL(bmap); > +#endif Eitherway, I am not 100% sure this is the right fix for this case, I remember some bmap() users who didn't need CONFIG_BLOCK, so we may still need to export it without CONFIG_BLOCK. Can you please send me your configuration? Thanks. > > /* > * With relative atime, only update atime if the previous atime is > -- > 2.24.0 > > -- > Cheers, > Stephen Rothwell -- Carlos