Re: [GIT PULL] dlm updates for 2.6.27

Andrew Morton
2008-07-31T04:36:25Z

On Mon, 28 Jul 2008 11:11:58 -0500 David Teigland <teigland@redhat.com> wrote:

> please pull dlm updates for 2.6.27 from:

sparc allmodconfig explodes in -mm:

fs/dlm/config.c:282: error: redefinition of 'struct node'
fs/dlm/config.c:390: error: expected identifier or '(' before '{' token
fs/dlm/config.c: In function 'drop_node':
fs/dlm/config.c:582: error: 'struct node' has no member named 'sysdev'
fs/dlm/config.c:582: warning: type defaults to 'int' in declaration of '__mptr'
fs/dlm/config.c:582: warning: initialization from incompatible pointer type
fs/dlm/config.c:582: error: 'struct node' has no member named 'sysdev'
fs/dlm/config.c: In function 'release_node':
fs/dlm/config.c:594: error: 'struct node' has no member named 'sysdev'
fs/dlm/config.c:594: warning: type defaults to 'int' in declaration of '__mptr'
fs/dlm/config.c:594: warning: initialization from incompatible pointer type
fs/dlm/config.c:594: error: 'struct node' has no member named 'sysdev'
fs/dlm/config.c: In function 'show_node':
fs/dlm/config.c:708: error: 'struct node' has no member named 'sysdev'
fs/dlm/config.c:708: warning: type defaults to 'int' in declaration of '__mptr'
fs/dlm/config.c:708: warning: initialization from incompatible pointer type
fs/dlm/config.c:708: error: 'struct node' has no member named 'sysdev'
fs/dlm/config.c: In function 'store_node':
fs/dlm/config.c:717: error: 'struct node' has no member named 'sysdev'
fs/dlm/config.c:717: warning: type defaults to 'int' in declaration of '__mptr'
fs/dlm/config.c:717: warning: initialization from incompatible pointer type
fs/dlm/config.c:717: error: 'struct node' has no member named 'sysdev'

Because there's already a `struct node' in include/linux/node.h.

This is because some random unrelated patch
(vmscan-unevictable-lru-scan-sysctl.patch) in -mm has caused
include/linux/node.h to get included in the fs/dlm/config.c build on
sparc32.

`struct node' was a poor choice of name! Please rename it prior to the
2.6.27 release so that bisectability won't break if/when we merge
vmscan-unevictable-lru-scan-sysctl.patch. Plus this bug might already
be present in mainline, only nobody has yet found the config which
triggers it.