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=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 4806DC33CA3 for ; Fri, 10 Jan 2020 10:00:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 16AAB20721 for ; Fri, 10 Jan 2020 10:00:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="cH4QITWT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727448AbgAJKAf (ORCPT ); Fri, 10 Jan 2020 05:00:35 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:45750 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727336AbgAJKAe (ORCPT ); Fri, 10 Jan 2020 05:00:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578650433; 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=ZEJOe+m0LRVK77DXnNtP8p/BGUzC9JGv9T2KHXsbmK4=; b=cH4QITWTXwQjYFr5+9gUMKCOPQiEd35hXSER+qDJXvyHBs/LsS1ZlVdnY/A10Q0b0s/Rmy B/0HAty9b0xohzyjQ+PZE3B/3bJDdct9rvm3iF1icC3mkrjkXYx8dd5sLOESvEtjJ6NJNX hVi+9+qanqKaaD71rPF+goQNXOV5lp8= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-307-vIZaUzbwPB69EKQs3JT-Eg-1; Fri, 10 Jan 2020 05:00:30 -0500 X-MC-Unique: vIZaUzbwPB69EKQs3JT-Eg-1 Received: by mail-wr1-f70.google.com with SMTP id r2so676130wrp.7 for ; Fri, 10 Jan 2020 02:00:30 -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=ZEJOe+m0LRVK77DXnNtP8p/BGUzC9JGv9T2KHXsbmK4=; b=by/AV3GnKq2e1EbMSV9xHGGA9wDHx1SxNoszX06OGZqGxhwSgy0CuKHgUvZKPGKSzU EWA8tlR8VP+8+6rThQGrsfZe5cCZOtJOZkOyJuh+4I4mBa0fFGh9tGIsLLHsoyXrOnVH pNy2otZa3P2sLSPSKaMM9cK5aSItOZjKRqYvo4twhcdqg3jl6Yb4PdywgOkGLruPYGa5 1inhvMIHqIBn8Jaqp2mR1foMrpG3zTlMn9l5ktq5OUQAc1joBXOv6ZwZ1IY3dU1iJVPW PML6owYf/i64nHwrGSFhZcMc1T8x61bswkTGihHuU1LsF9Jnr9q6UI2m+RO4YCEM+M1H XEcQ== X-Gm-Message-State: APjAAAUCWZYtyLAt+5HuUpazP9wv/FyzR7DcccomeqwxktSPLgEi+mhk rCCHnF44J0fPrKbwsUC0AJVn2p5y8DnIwA+igYfweqnoMyD3SrzqJnIqEmfyxCbLCpwPiU+WAD/ ZeSjJ0tTEkQ6MdjsbFXgez8sr X-Received: by 2002:a5d:4e90:: with SMTP id e16mr2654032wru.318.1578650429348; Fri, 10 Jan 2020 02:00:29 -0800 (PST) X-Google-Smtp-Source: APXvYqzErJyAjuanB6s1sCbANE2E/oqAF+bCw5sVhk6ja2jWTr1CS4wpkn39zXrNHRXvqQTq2ed4BQ== X-Received: by 2002:a5d:4e90:: with SMTP id e16mr2654007wru.318.1578650429097; Fri, 10 Jan 2020 02:00:29 -0800 (PST) Received: from orion ([213.175.37.12]) by smtp.gmail.com with ESMTPSA id r5sm1569207wrt.43.2020.01.10.02.00.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2020 02:00:28 -0800 (PST) Date: Fri, 10 Jan 2020 11:00:26 +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: <20200110100026.xrt4avwsbbuobe7x@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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Meh... 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) > | ^~~~ > > Caused by commit > > 65a805fdd75f ("fibmap: Use bmap instead of ->bmap method in ioctl_fibmap") > > I have added this patch for today: I had a fix to it, in one of my previous patches but I forgot to add it to this version. > > From: Stephen Rothwell > Date: Fri, 10 Jan 2020 17:53:19 +1100 > Subject: [PATCH] fs: fix up for !CONFIG_BLOCK and bmap > > Signed-off-by: Stephen Rothwell > --- > 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 The problem with this fix, is the fact bmap() could still be called for some users even withouth CONFIG_BLOCK, so, it needs to have a dummy function to return -EINVAL in case CONFIG_BLOCK is disabled. I'll send a patch to fix it. Thanks for spotting it Stephen. > > /* > * With relative atime, only update atime if the previous atime is > -- > 2.24.0 > > -- > Cheers, > Stephen Rothwell -- Carlos