Skip to contentSkip to conversation

linux-next: build failure after merge of the xfs tree

DISCUSSION Stephen Rothwell 2 participants 3 messages Dec 10, 2024 – Dec 11, 2024 Linux-next tree

lore
Share & tools
lore
#0 lore raw

Hi all,

After merging the xfs tree, today's linux-next build (powerpc ppc64_defconfig) failed like this:

fs/xfs/xfs_trans.c: In function '__xfs_trans_commit':
fs/xfs/xfs_trans.c:869:40: error: macro "xfs_trans_apply_dquot_deltas" requires 2 arguments, but only 1 given
869 | xfs_trans_apply_dquot_deltas(tp);
| ^
In file included from fs/xfs/xfs_trans.c:15:
fs/xfs/xfs_quota.h:176:9: note: macro "xfs_trans_apply_dquot_deltas" defined here
176 | #define xfs_trans_apply_dquot_deltas(tp, a)

      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

03d23e3ebeb7 ("xfs: don't lose solo dquot update transactions")

$ grep CONFIG_XFS_QUOTA .config
# CONFIG_XFS_QUOTA is not set

I have used the xfs tree from next-20241210 for today.

Signature · 2 lines
Cheers,
Stephen Rothwell
#1 lore raw
Quoted 14 lines · Stephen Rothwell

Hi all,

After merging the xfs tree, today's linux-next build (powerpc ppc64_defconfig) failed like this:

fs/xfs/xfs_trans.c: In function '__xfs_trans_commit':
fs/xfs/xfs_trans.c:869:40: error: macro "xfs_trans_apply_dquot_deltas" requires 2 arguments, but only 1 given
869 | xfs_trans_apply_dquot_deltas(tp);
| ^
In file included from fs/xfs/xfs_trans.c:15:
fs/xfs/xfs_quota.h:176:9: note: macro "xfs_trans_apply_dquot_deltas" defined here
176 | #define xfs_trans_apply_dquot_deltas(tp, a)

      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
Quoted 9 lines

Caused by commit

03d23e3ebeb7 ("xfs: don't lose solo dquot update transactions")

$ grep CONFIG_XFS_QUOTA .config
# CONFIG_XFS_QUOTA is not set

I have used the xfs tree from next-20241210 for today.

Thanks Stephen. I'm testing the fix now, and I'll push an update today.

Carlos

Quoted 3 lines
Signature · 2 lines
Cheers,
Stephen Rothwell
#2 lore raw
In reply to Stephen Rothwell
Quoted 14 lines · Stephen Rothwell

Hi all,

After merging the xfs tree, today's linux-next build (powerpc ppc64_defconfig) failed like this:

fs/xfs/xfs_trans.c: In function '__xfs_trans_commit':
fs/xfs/xfs_trans.c:869:40: error: macro "xfs_trans_apply_dquot_deltas" requires 2 arguments, but only 1 given
869 | xfs_trans_apply_dquot_deltas(tp);
| ^
In file included from fs/xfs/xfs_trans.c:15:
fs/xfs/xfs_quota.h:176:9: note: macro "xfs_trans_apply_dquot_deltas" defined here
176 | #define xfs_trans_apply_dquot_deltas(tp, a)

      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
Quoted 8 lines

Caused by commit

03d23e3ebeb7 ("xfs: don't lose solo dquot update transactions")

$ grep CONFIG_XFS_QUOTA .config
# CONFIG_XFS_QUOTA is not set

I have used the xfs tree from next-20241210 for today.

I just pushed a few extra patches to xfs-linux/for-next, which includes the failure to build without QUOTA config enabled.

I also did a build test on different configurations (and added a todo list to improve build testing here), so, it should be ok for you to pull it now Stephen.

Let me know please if you find some other issue.

Have a nice day out there.

Carlos