diff mbox series

xfs: fix !quota build

Message ID 20241211035433.1321051-1-hch@lst.de (mailing list archive)
State Rejected
Headers show
Series xfs: fix !quota build | expand

Commit Message

Christoph Hellwig Dec. 11, 2024, 3:54 a.m. UTC
fix the !quota stub for xfs_trans_apply_dquot_deltas.

Fixes: 03d23e3ebeb7 ("xfs: don't lose solo dquot update transactions")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/xfs/xfs_quota.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Carlos Maiolino Dec. 11, 2024, 9:42 a.m. UTC | #1
On Wed, Dec 11, 2024 at 04:54:32AM +0100, Christoph Hellwig wrote:
> fix the !quota stub for xfs_trans_apply_dquot_deltas.
> 
> Fixes: 03d23e3ebeb7 ("xfs: don't lose solo dquot update transactions")
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  fs/xfs/xfs_quota.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/xfs/xfs_quota.h b/fs/xfs/xfs_quota.h
> index b864ed597877..d7565462af3d 100644
> --- a/fs/xfs/xfs_quota.h
> +++ b/fs/xfs/xfs_quota.h
> @@ -173,7 +173,7 @@ static inline void xfs_trans_mod_dquot_byino(struct xfs_trans *tp,
>  		struct xfs_inode *ip, uint field, int64_t delta)
>  {
>  }
> -#define xfs_trans_apply_dquot_deltas(tp, a)
> +#define xfs_trans_apply_dquot_deltas(tp)
>  #define xfs_trans_unreserve_and_mod_dquots(tp, a)
>  static inline int xfs_trans_reserve_quota_nblks(struct xfs_trans *tp,
>  		struct xfs_inode *ip, int64_t dblocks, int64_t rblocks,

Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>


> -- 
> 2.45.2
>
Darrick J. Wong Dec. 11, 2024, 5:33 p.m. UTC | #2
On Wed, Dec 11, 2024 at 04:54:32AM +0100, Christoph Hellwig wrote:
> fix the !quota stub for xfs_trans_apply_dquot_deltas.
> 
> Fixes: 03d23e3ebeb7 ("xfs: don't lose solo dquot update transactions")
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Doh, looks like I got confused by all the bot reports and modified both.
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

Also, can we get rid of CONFIG_XFS_{QUOTA,POSIX_ACL}?  Maintaining all
these dummy macros is ... irritating.

--D

> ---
>  fs/xfs/xfs_quota.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/xfs/xfs_quota.h b/fs/xfs/xfs_quota.h
> index b864ed597877..d7565462af3d 100644
> --- a/fs/xfs/xfs_quota.h
> +++ b/fs/xfs/xfs_quota.h
> @@ -173,7 +173,7 @@ static inline void xfs_trans_mod_dquot_byino(struct xfs_trans *tp,
>  		struct xfs_inode *ip, uint field, int64_t delta)
>  {
>  }
> -#define xfs_trans_apply_dquot_deltas(tp, a)
> +#define xfs_trans_apply_dquot_deltas(tp)
>  #define xfs_trans_unreserve_and_mod_dquots(tp, a)
>  static inline int xfs_trans_reserve_quota_nblks(struct xfs_trans *tp,
>  		struct xfs_inode *ip, int64_t dblocks, int64_t rblocks,
> -- 
> 2.45.2
>
Christoph Hellwig Dec. 11, 2024, 5:36 p.m. UTC | #3
On Wed, Dec 11, 2024 at 09:33:18AM -0800, Darrick J. Wong wrote:
> Also, can we get rid of CONFIG_XFS_{QUOTA,POSIX_ACL}?  Maintaining all
> these dummy macros is ... irritating.

I have a slightly older branch that looked into the config options
including module size comparisms.  Quota is surprisingly big, RT less so,
but ACL should be a no-brainer:

http://git.infradead.org/?p=users/hch/xfs.git;a=shortlog;h=refs/heads/xfs-config-options
diff mbox series

Patch

diff --git a/fs/xfs/xfs_quota.h b/fs/xfs/xfs_quota.h
index b864ed597877..d7565462af3d 100644
--- a/fs/xfs/xfs_quota.h
+++ b/fs/xfs/xfs_quota.h
@@ -173,7 +173,7 @@  static inline void xfs_trans_mod_dquot_byino(struct xfs_trans *tp,
 		struct xfs_inode *ip, uint field, int64_t delta)
 {
 }
-#define xfs_trans_apply_dquot_deltas(tp, a)
+#define xfs_trans_apply_dquot_deltas(tp)
 #define xfs_trans_unreserve_and_mod_dquots(tp, a)
 static inline int xfs_trans_reserve_quota_nblks(struct xfs_trans *tp,
 		struct xfs_inode *ip, int64_t dblocks, int64_t rblocks,