linux-kernel - linux-next: build failure after merge of the block tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20200312135457.6891749e@canb.auug.org.au>
Date:   Thu, 12 Mar 2020 13:54:57 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jens Axboe <axboe@...nel.dk>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Matteo Croce <mcroce@...hat.com>,
        "Martin K. Petersen" <martin.petersen@...cle.com>,
        Coly Li <colyli@...e.de>
Subject: linux-next: build failure after merge of the block tree

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

Content of type "application/pgp-signature" skipped