Received: by 2002:a25:e7d8:0:0:0:0:0 with SMTP id e207csp508317ybh; Thu, 12 Mar 2020 06:11:58 -0700 (PDT) X-Google-Smtp-Source: ADFU+vt1ld+mvlW4LJs68AHw5MH/+opZhwPnwexbcYr0xnM0bIbKYUZ8qdqO1F9sjaV/fWLSWVp1 X-Received: by 2002:aca:1a06:: with SMTP id a6mr2429343oia.148.1584018718563; Thu, 12 Mar 2020 06:11:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584018718; cv=none; d=google.com; s=arc-20160816; b=n6R2nqNpHe9NaTLJV6qGg6l2e4ElKZaIdv408VnGG0DCzQL0vZNX3b0M3qW9XN33Ft cFTDR8FYOg0Lq07TjHgnNJobv3J35Tq837YM/lBg7VQRml0LKwRLY7KsNy7jA5Oo5A1r UPflEidoaoRWsA9N226RvDwDdKROgl8RRsmJMal+8Oir6n8osinSep3rcJsBD9o+g5jB 8JQ9Z0hRxzo+Kvbz+1JfoqCNkGGiSbYF+qRwVfQv0InSqCU0v4XiTPASu4f5eoQfGQsl uEgtVR1JzMJk0Zj11tZKRxEYE+68QF1YNky3qpzn2oBFBRmQbD4+lAM07Q91+UqSIwCs c/2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature; bh=mUPVwLwbl+qGOG5kVPBNHG9adxeUh8JOP6RdVyzLB/I=; b=TXkmxaTm5REO0hPBRtPUy4cLPcHq0aBtr7HsRuD76HP0ERPP5jRfnRg5sirhMdcYWe WDCilWa7C5/C01WQ9HEzvcx2OZ5qH0O7eAo6O73+IUuHRT96Ah7DK6VzFbemdYZFkxaf sWTz9u00fYb9ufJGovLvYUlXaIm9pBvuX0KlufbgC10dbjqfcinu83BGKp93ZMuVpeTt m254YyfZ6XDmeBlcSYCAupVglkL5ZClzffQRBTmXjm/fBQ+Hh1twNpELh8eg5A2ZJ/uK 58i7BNYMjPcwQg7qmOJLOP4o3DZDW8cmgeUdJ7xT2KvGthjwWR+0RSSnbaPomR/XowoG Zi0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20150623.gappssmtp.com header.s=20150623 header.b=E+os28dR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l65si2640966oig.156.2020.03.12.06.11.45; Thu, 12 Mar 2020 06:11:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel-dk.20150623.gappssmtp.com header.s=20150623 header.b=E+os28dR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727175AbgCLNHV (ORCPT + 99 others); Thu, 12 Mar 2020 09:07:21 -0400 Received: from mail-io1-f68.google.com ([209.85.166.68]:47022 "EHLO mail-io1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726194AbgCLNHV (ORCPT ); Thu, 12 Mar 2020 09:07:21 -0400 Received: by mail-io1-f68.google.com with SMTP id v3so5544721iom.13 for ; Thu, 12 Mar 2020 06:07:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=mUPVwLwbl+qGOG5kVPBNHG9adxeUh8JOP6RdVyzLB/I=; b=E+os28dRCW2/v1ohMkOsikz/8hYa7mpints86TuEemrPaYqU6XFgB2aiT2cRuJY/fb nWSpMZV5DwN1EbY83N0wRV2dr4MAFwDe3mDlmZpLuL3F1aEClDztKuAC8FExEsIW2QB2 bTWsm3Zev9Fi9+yVqLGy6MqlDPxW8PksROSMyEp7FAj6gDltIaD9ndaQE+X805buhieW n57qicJpBwPBLvI8tHA7wVnhwRY8RfTWtsSIZgRa28eYts4CKOHUhgesF0EyDskOIXls benlZXj9g43xMpir3r2H0EHiCmH7U+NlkRhcYsmy8/hNWwdkY/z2/yp6k+ORpIkBiuVo eQJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=mUPVwLwbl+qGOG5kVPBNHG9adxeUh8JOP6RdVyzLB/I=; b=W8mMrxrwuMO9NNNmh21h7094vd5pAx2VF4PrVllm7HHCHQSzYAE6o8wBtOShuAptad 2qJ2t09YxmCuzFINp9BQjCVq0COooLKlBD/ZS82ekx0d4W2xZx9CdmIe7DeqdZBYFqT6 w7v3/b5O5PjjvxlGszM51ubcCd6raHGUrPanmcVx5YxibLi5tpXK0bjDfqNzfgY8Kne7 dNgPDMdscpEwzG1x2s3z31Jqa+j9focD0De8gebofCprvPd329/IB++3MDZBAkxz0Hh/ Y1ZfBzsv8lWEVmBC0z6r5OnakUobVvP/RErbu6C8fnVVPw+33ay5YZABblzEXQLvd+LN W05Q== X-Gm-Message-State: ANhLgQ3gJCfjH69LdRuGY609oUUxvgc0IEgQN2F6gVNZppUR0nMGOZqv 2xIXJV/MVGM4Fadg5qtnurr1uQ== X-Received: by 2002:a5d:984e:: with SMTP id p14mr7593477ios.115.1584018439543; Thu, 12 Mar 2020 06:07:19 -0700 (PDT) Received: from [192.168.1.159] ([65.144.74.34]) by smtp.gmail.com with ESMTPSA id n18sm5383585ilq.38.2020.03.12.06.07.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 12 Mar 2020 06:07:19 -0700 (PDT) Subject: Re: linux-next: build failure after merge of the block tree To: Matteo Croce , Stephen Rothwell Cc: Linux Next Mailing List , Linux Kernel Mailing List , "Martin K. Petersen" , Coly Li References: <20200312135457.6891749e@canb.auug.org.au> From: Jens Axboe Message-ID: Date: Thu, 12 Mar 2020 07:07:17 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 3/12/20 4:12 AM, Matteo Croce wrote: > On Thu, Mar 12, 2020 at 3:55 AM Stephen Rothwell wrote: >> >> Hi all, >> >> After merging the block tree, today's linux-next build (x86_64 >> allmodconfig) failed like this: >> >> In file included from fs/erofs/xattr.h:10, >> from fs/erofs/inode.c:7: >> fs/erofs/inode.c: In function 'erofs_read_inode': >> fs/erofs/internal.h:197:31: error: 'PAGE_SECTORS_SHIFT' undeclared (first use in this function); did you mean 'PA_SECTION_SHIFT'? >> 197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT >> | ^~~~~~~~~~~~~~~~~~ >> fs/erofs/inode.c:122:30: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK' >> 122 | inode->i_blocks = nblks << LOG_SECTORS_PER_BLOCK; >> | ^~~~~~~~~~~~~~~~~~~~~ >> fs/erofs/internal.h:197:31: note: each undeclared identifier is reported only once for each function it appears in >> 197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT >> | ^~~~~~~~~~~~~~~~~~ >> fs/erofs/inode.c:122:30: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK' >> 122 | inode->i_blocks = nblks << LOG_SECTORS_PER_BLOCK; >> | ^~~~~~~~~~~~~~~~~~~~~ >> In file included from fs/erofs/data.c:7: >> fs/erofs/data.c: In function 'erofs_read_raw_page': >> fs/erofs/internal.h:197:31: error: 'PAGE_SECTORS_SHIFT' undeclared (first use in this function); did you mean 'PA_SECTION_SHIFT'? >> 197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT >> | ^~~~~~~~~~~~~~~~~~ >> fs/erofs/data.c:226:4: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK' >> 226 | LOG_SECTORS_PER_BLOCK; >> | ^~~~~~~~~~~~~~~~~~~~~ >> fs/erofs/internal.h:197:31: note: each undeclared identifier is reported only once for each function it appears in >> 197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT >> | ^~~~~~~~~~~~~~~~~~ >> fs/erofs/data.c:226:4: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK' >> 226 | LOG_SECTORS_PER_BLOCK; >> | ^~~~~~~~~~~~~~~~~~~~~ >> fs/erofs/data.c: In function 'erofs_bmap': >> fs/erofs/internal.h:197:31: error: 'PAGE_SECTORS_SHIFT' undeclared (first use in this function); did you mean 'PA_SECTION_SHIFT'? >> 197 | #define LOG_SECTORS_PER_BLOCK PAGE_SECTORS_SHIFT >> | ^~~~~~~~~~~~~~~~~~ >> fs/erofs/data.c:351:16: note: in expansion of macro 'LOG_SECTORS_PER_BLOCK' >> 351 | if (block >> LOG_SECTORS_PER_BLOCK >= blks) >> | ^~~~~~~~~~~~~~~~~~~~~ >> >> Caused by commit >> >> 61c7d3d5e015 ("block: refactor duplicated macros") >> >> I have used the block tree from next-20200311 for today. >> >> -- >> Cheers, >> Stephen Rothwell > > Hi, > > I was building a kernel without erofs. Just including > include/linux/blkdev.h will fix it, should I amend the > patch or send a fix? I'll drop the patch. I was worried about the patch to begin with, something like this really should be done through cocinelle so there's less concern of a stupid mistake. On top of that, somewhat miffed that you'd have a v3 of a patch, yet haven't bothered to even _compile_ the parts you touch. That's inexcusable. -- Jens Axboe