Skip to contentSkip to conversation

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

PATCH In review Stephen Rothwell 3 participants 3 messages Jul 7, 2020

Subsystems (2)
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:

ld: fs/xfs/xfs_buf_item.o: in function `.xfs_buf_dquot_iodone':
xfs_buf_item.c:(.text+0x21a0): undefined reference to `.xfs_dquot_done'

Caused by commit

018dc1667913 ("xfs: use direct calls for dquot IO completion")

# CONFIG_XFS_QUOTA is not set

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

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

PATCH 1/1 xfs: fix non-quota build breakage

From: Dave Chinner <[email protected]>

Oops, I forgot that you can config out quotas because nobody ever does that when they build XFS anymore.

Fixes 018dc1667913 ("xfs: use direct calls for dquot IO completion")
---
 fs/xfs/xfs_dquot.h | 1 -
 fs/xfs/xfs_quota.h | 9 +++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
fs/xfs/xfs_dquot.h +0 -1
index fe9cc3e08ed6..71e36c85e20b 100644
@@ -174,7 +174,6 @@ void		xfs_qm_dqput(struct xfs_dquot *dqp);
 void		xfs_dqlock2(struct xfs_dquot *, struct xfs_dquot *);
 
 void		xfs_dquot_set_prealloc_limits(struct xfs_dquot *);
-void		xfs_dquot_done(struct xfs_buf *);
 
 static inline struct xfs_dquot *xfs_qm_dqhold(struct xfs_dquot *dqp)
 {
fs/xfs/xfs_quota.h +9 -0
index aa8fc1f55fbd..c92ae5e02ce8 100644
@@ -13,6 +13,7 @@
  */
 
 struct xfs_trans;
+struct xfs_buf;
 
 /*
  * This check is done typically without holding the inode lock;
@@ -107,6 +108,8 @@ extern void xfs_qm_mount_quotas(struct xfs_mount *);
 extern void xfs_qm_unmount(struct xfs_mount *);
 extern void xfs_qm_unmount_quotas(struct xfs_mount *);
 
+void		xfs_dquot_done(struct xfs_buf *);
+
 #else
 static inline int
 xfs_qm_vop_dqalloc(struct xfs_inode *ip, kuid_t kuid, kgid_t kgid,
@@ -148,6 +151,12 @@ static inline int xfs_trans_reserve_quota_bydquots(struct xfs_trans *tp,
 #define xfs_qm_mount_quotas(mp)
 #define xfs_qm_unmount(mp)
 #define xfs_qm_unmount_quotas(mp)
+
+static inline void xfs_dquot_done(struct xfs_buf *bp)
+{
+	return;
+}
+
 #endif /* CONFIG_XFS_QUOTA */
 
 #define xfs_trans_unreserve_quota_nblks(tp, ip, nblks, ninos, flags) \
Reviewed-by on v1 1/1
#2 lore raw

Re: [PATCH] xfs: fix non-quota build breakage

Quoted 9 lines · Dave Chinner

From: Dave Chinner <[email protected]>

Oops, I forgot that you can config out quotas because nobody ever does that when they build XFS anymore.

Fixes 018dc1667913 ("xfs: use direct calls for dquot IO completion")

Looks ok,

--D

Quoted 51 lines
---
 fs/xfs/xfs_dquot.h | 1 -
 fs/xfs/xfs_quota.h | 9 +++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
fs/xfs/xfs_dquot.h +0 -1
index fe9cc3e08ed6..71e36c85e20b 100644
@@ -174,7 +174,6 @@ void		xfs_qm_dqput(struct xfs_dquot *dqp);
 void		xfs_dqlock2(struct xfs_dquot *, struct xfs_dquot *);
 
 void		xfs_dquot_set_prealloc_limits(struct xfs_dquot *);
-void		xfs_dquot_done(struct xfs_buf *);
 
 static inline struct xfs_dquot *xfs_qm_dqhold(struct xfs_dquot *dqp)
 {
fs/xfs/xfs_quota.h +9 -0
index aa8fc1f55fbd..c92ae5e02ce8 100644
@@ -13,6 +13,7 @@
  */
 
 struct xfs_trans;
+struct xfs_buf;
 
 /*
  * This check is done typically without holding the inode lock;
@@ -107,6 +108,8 @@ extern void xfs_qm_mount_quotas(struct xfs_mount *);
 extern void xfs_qm_unmount(struct xfs_mount *);
 extern void xfs_qm_unmount_quotas(struct xfs_mount *);
 
+void		xfs_dquot_done(struct xfs_buf *);
+
 #else
 static inline int
 xfs_qm_vop_dqalloc(struct xfs_inode *ip, kuid_t kuid, kgid_t kgid,
@@ -148,6 +151,12 @@ static inline int xfs_trans_reserve_quota_bydquots(struct xfs_trans *tp,
 #define xfs_qm_mount_quotas(mp)
 #define xfs_qm_unmount(mp)
 #define xfs_qm_unmount_quotas(mp)
+
+static inline void xfs_dquot_done(struct xfs_buf *bp)
+{
+	return;
+}
+
 #endif /* CONFIG_XFS_QUOTA */
 
 #define xfs_trans_unreserve_quota_nblks(tp, ip, nblks, ninos, flags) \