don't allow disabling quota accounting on a mounted file system v2
Hi all,
disabling quota accounting (vs just enforcement) on a running file system is a fundamentally race and hard to get right operation. It also has very little practical use.
Note that the quotaitem log recovery code is left for to make sure we don't introduce inconsistent recovery states.
A series has been sent to make xfstests cope with this feature removal.
Changes since v1:
- fix a spelling mistake
Diffstat:
libxfs/xfs_quota_defs.h | 30 ----- libxfs/xfs_trans_resv.c | 30 ----- libxfs/xfs_trans_resv.h | 2 scrub/quota.c | 2 xfs_dquot.c | 3 xfs_dquot_item.c | 134 -------------------------- xfs_dquot_item.h | 17 --- xfs_ioctl.c | 2 xfs_iops.c | 4 xfs_mount.c | 4 xfs_qm.c | 44 +++----- xfs_qm.h | 3 xfs_qm_syscalls.c | 243 ++---------------------------------------------- xfs_quotaops.c | 30 +---- xfs_super.c | 51 ++++------ xfs_trans_dquot.c | 49 --------- 16 files changed, 77 insertions(+), 571 deletions(-)
PATCH 1/3 xfs: remove support for disabling quota accounting on a mounted file system
Disabling quota accounting is hairy, racy code with all kinds of pitfalls. And it has a very strange mind set, as quota accounting (unlike enforcement) really is a propery of the on-disk format. There is no good use case for supporting this.
--- fs/xfs/libxfs/xfs_trans_resv.c | 30 ---- fs/xfs/libxfs/xfs_trans_resv.h | 2 - fs/xfs/xfs_dquot_item.c | 134 ------------------ fs/xfs/xfs_dquot_item.h | 17 --- fs/xfs/xfs_qm.c | 2 +- fs/xfs/xfs_qm.h | 3 - fs/xfs/xfs_qm_syscalls.c | 241 ++------------------------------- fs/xfs/xfs_trans_dquot.c | 38 ------ 8 files changed, 13 insertions(+), 454 deletions(-)
fs/xfs/libxfs/xfs_trans_resv.c +0 -30
@@ -798,29 +798,6 @@ xfs_calc_qm_dqalloc_reservation( XFS_FSB_TO_B(mp, XFS_DQUOT_CLUSTER_SIZE_FSB) - 1); } -/* -* Turning off quotas. -* the quota off logitems: sizeof(struct xfs_qoff_logitem) * 2 -* the superblock for the quota flags: sector size -*/ -STATIC uint -xfs_calc_qm_quotaoff_reservation ( -struct xfs_mount *mp) -{ -return sizeof (struct xfs_qoff_logitem ) *2 + -xfs_calc_buf_res (1 , mp->m_sb.sb_sectsize); -} - -/* -* End of turning off quotas. -* the quota off logitems: sizeof(struct xfs_qoff_logitem) * 2 -*/ -STATIC uint -xfs_calc_qm_quotaoff_end_reservation (void ) -{ -return sizeof (struct xfs_qoff_logitem ) *2 ; -} -/* * Syncing the incore super block changes to disk. * the super block to reflect the changes: sector size
@@ -923,13 +900,6 @@ xfs_trans_resv_calc( resp->tr_qm_setqlim.tr_logres =xfs_calc_qm_setqlim_reservation (); resp->tr_qm_setqlim.tr_logcount =XFS_DEFAULT_LOG_COUNT ; - resp->tr_qm_quotaoff.tr_logres =xfs_calc_qm_quotaoff_reservation (mp); - resp->tr_qm_quotaoff.tr_logcount =XFS_DEFAULT_LOG_COUNT ; - - resp->tr_qm_equotaoff.tr_logres = -xfs_calc_qm_quotaoff_end_reservation (); - resp->tr_qm_equotaoff.tr_logcount =XFS_DEFAULT_LOG_COUNT ; - resp->tr_sb.tr_logres =xfs_calc_sb_reservation (mp); resp->tr_sb.tr_logcount =XFS_DEFAULT_LOG_COUNT ;
fs/xfs/libxfs/xfs_trans_resv.h +0 -2
@@ -46,8 +46,6 @@ struct xfs_trans_resv {struct xfs_trans_res tr_growrtfree;/* grow realtime freeing */ struct xfs_trans_res tr_qm_setqlim;/* adjust quota limits */ struct xfs_trans_res tr_qm_dqalloc;/* allocate quota on disk */ -struct xfs_trans_res tr_qm_quotaoff;/* turn quota off */ -struct xfs_trans_res tr_qm_equotaoff;/* end of turn quota off */ struct xfs_trans_res tr_sb;/* modify superblock */ struct xfs_trans_res tr_fsyncts;/* update timestamps on fsync */ };
fs/xfs/xfs_dquot_item.c +0 -134
137 lines not on this page · raw message
fs/xfs/xfs_dquot_item.h +0 -17
@@ -9,7 +9,6 @@struct xfs_dquot ;struct xfs_trans ;struct xfs_mount ; -struct xfs_qoff_logitem ;struct xfs_dq_logitem {struct xfs_log_item qli_item;/* common portion */
@@ -17,22 +16,6 @@ struct xfs_dq_logitem { xfs_lsn_t qli_flush_lsn; /* lsn at last flush */ }; -struct xfs_qoff_logitem { -struct xfs_log_item qql_item;/* common portion */ -struct xfs_qoff_logitem *qql_start_lip;/* qoff-start logitem, if any */ -unsigned int qql_flags; -}; - -void xfs_qm_dquot_logitem_init (struct xfs_dquot *dqp); -struct xfs_qoff_logitem *xfs_qm_qoff_logitem_init (struct xfs_mount *mp, -struct xfs_qoff_logitem *start, -uint flags); -void xfs_qm_qoff_logitem_relse (struct xfs_qoff_logitem *); -struct xfs_qoff_logitem *xfs_trans_get_qoff_item (struct xfs_trans *tp, -struct xfs_qoff_logitem *startqoff, -uint flags); -void xfs_trans_log_quotaoff_item (struct xfs_trans *tp, -struct xfs_qoff_logitem *qlp);#endif /* __XFS_DQUOT_ITEM_H__ */
fs/xfs/xfs_qm.c +1 -1
@@ -185,7 +185,7 @@ xfs_qm_dqpurge(/* * Purge the dquot cache. */ -void +static void xfs_qm_dqpurge_all (struct xfs_mount *mp,uint flags)
fs/xfs/xfs_qm.h +0 -3
@@ -140,9 +140,6 @@ struct xfs_dquot_acct {extern void xfs_qm_destroy_quotainfo (struct xfs_mount *); -/* dquot stuff */ -extern void xfs_qm_dqpurge_all (struct xfs_mount *,uint ); -/* quota ops */ extern int xfs_qm_scall_trunc_qfiles (struct xfs_mount *,uint ); extern int xfs_qm_scall_getquota(struct xfs_mount *mp,
fs/xfs/xfs_qm_syscalls.c +12 -229
263 lines not on this page · raw message
fs/xfs/xfs_trans_dquot.c +0 -38
@@ -843,44 +843,6 @@ xfs_trans_reserve_quota_icreate( dblocks, 1, XFS_QMOPT_RES_REGBLKS); } -/* -* This routine is called to allocate a quotaoff log item. -*/ -struct xfs_qoff_logitem * -xfs_trans_get_qoff_item ( -struct xfs_trans *tp, -struct xfs_qoff_logitem *startqoff, -uint flags) -{ -struct xfs_qoff_logitem *q; - -ASSERT (tp !=NULL ); - - q =xfs_qm_qoff_logitem_init (tp->t_mountp, startqoff, flags); -ASSERT (q !=NULL ); - -/* -* Get a log_item_desc to point at the new item. -*/ -xfs_trans_add_item (tp, &q->qql_item); -return q; -} - - -/* -* This is called to mark the quotaoff logitem as needing -* to be logged when the transaction is committed. The logitem must -* already be associated with the given transaction. -*/ -void -xfs_trans_log_quotaoff_item ( -struct xfs_trans *tp, -struct xfs_qoff_logitem *qlp) -{ - tp->t_flags |=XFS_TRANS_DIRTY ; -set_bit (XFS_LI_DIRTY , &qlp->qql_item.li_flags); -} - STATIC voidxfs_trans_alloc_dqinfo (xfs_trans_t *tp)
Signature · 1 line
2.30.2
Re: [PATCH 1/3] xfs: remove support for disabling quota accounting on a mounted file system
Quoted 3 lines · Christoph Hellwig
Disabling quota accounting is hairy, racy code with all kinds of pitfalls. And it has a very strange mind set, as quota accounting (unlike enforcement) really is a propery of the on-disk format. There is no good
s/propery/property/
Quoted 4 lines
use case for supporting this.
Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Carlos Maiolino <[email protected]>
Quoted 11 lines
--- fs/xfs/libxfs/xfs_trans_resv.c | 30 ---- fs/xfs/libxfs/xfs_trans_resv.h | 2 - fs/xfs/xfs_dquot_item.c | 134 ------------------ fs/xfs/xfs_dquot_item.h | 17 --- fs/xfs/xfs_qm.c | 2 +- fs/xfs/xfs_qm.h | 3 - fs/xfs/xfs_qm_syscalls.c | 241 ++------------------------------- fs/xfs/xfs_trans_dquot.c | 38 ------ 8 files changed, 13 insertions(+), 454 deletions(-)
<snip> I think you could delete more...
fs/xfs/xfs_qm_syscalls.c xfs_qm_scall_quotaoff( · line 205
Quoted 12 lines
fs/xfs/xfs_qm_syscalls.c +0
-12-/* -* Give back all the dquot reference(s) held by inodes. -* Here we go thru every single incore inode in this file system, and -* do a dqrele on the i_udquot/i_gdquot that it may have. -* Essentially, as long as somebody has an inode locked, this guarantees -* that quotas will not be turned off. This is handy because in a -* transaction once we lock the inode(s) and check for quotaon, we can -* depend on the quota inodes (and other things) being valid as long as -* we keep the lock(s). -*/ - error =xfs_dqrele_all_inodes (mp, flags); -ASSERT (!error);
...because I think xfs_dqrele_all_inodes has lost all of its callers. Can you please remove it and XFS_ICWALK_DQRELE from xfs_icache.[ch]?
--D
Re: [PATCH 1/3] xfs: remove support for disabling quota accounting on a mounted file system
Quoted 4 lines · Darrick J. Wong
<snip> I think you could delete more...
...because I think
xfs_dqrele_all_inodeshas lost all of its callers. Can you please remove it andXFS_ICWALK_DQRELEfrom xfs_icache.[ch]?
---
From e8d07e55103636ce3207788e430eeff12b9ef153 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <[email protected]>
Date: Thu, 22 Jul 2021 20:58:55 +0200
Subject: xfs: remove xfs_dqrele_all_inodes
xfs_dqrele_all_inodes is unused now, remove it and all supporting code.
--- fs/xfs/xfs_icache.c | 107 +------------------------------------------- fs/xfs/xfs_icache.h | 6 --- 2 files changed, 1 insertion(+), 112 deletions(-)
fs/xfs/xfs_icache.c +1 -106
@@ -38,9 +38,6 @@* radix tree tags when convenient. Avoid existing XFS_IWALK namespace. */ enum xfs_icwalk_goal { -/* Goals that are not related to tags; these must be < 0. */ -XFS_ICWALK_DQRELE =-1 , -/* Goals directly associated with tagged inodes. */ XFS_ICWALK_BLOCKGC =XFS_ICI_BLOCKGC_TAG ,XFS_ICWALK_RECLAIM =XFS_ICI_RECLAIM_TAG ,
@@ -64,9 +61,6 @@ static int xfs_icwalk_ag(struct xfs_perag *pag,* Private inode cache walk flags for struct xfs_icwalk. Must not * coincide with XFS_ICWALK_FLAGS_VALID. */ -#define XFS_ICWALK_FLAG_DROP_UDQUOT (1U << 31) -#define XFS_ICWALK_FLAG_DROP_GDQUOT (1U << 30) -#define XFS_ICWALK_FLAG_DROP_PDQUOT (1U << 29)/* Stop scanning after icw_scan_limit inodes. */ #define XFS_ICWALK_FLAG_SCAN_LIMIT (1U << 28)
@@ -74,10 +68,7 @@ static int xfs_icwalk_ag(struct xfs_perag *pag,#define XFS_ICWALK_FLAG_RECLAIM_SICK (1U << 27)#define XFS_ICWALK_FLAG_UNION (1U << 26)/* union filter algorithm */ -#define XFS_ICWALK_PRIVATE_FLAGS (XFS_ICWALK_FLAG_DROP_UDQUOT | \ - XFS_ICWALK_FLAG_DROP_GDQUOT | \ - XFS_ICWALK_FLAG_DROP_PDQUOT | \ - XFS_ICWALK_FLAG_SCAN_LIMIT | \ +#define XFS_ICWALK_PRIVATE_FLAGS (XFS_ICWALK_FLAG_SCAN_LIMIT | \ XFS_ICWALK_FLAG_RECLAIM_SICK | \ XFS_ICWALK_FLAG_UNION)
@@ -817,97 +808,6 @@ xfs_icache_inode_is_allocated(return 0 ; } -#ifdef CONFIG_XFS_QUOTA -/* Decide if we want to grab this inode to drop its dquots. */ -static bool -xfs_dqrele_igrab ( -struct xfs_inode *ip) -{ -bool ret = false; - -ASSERT (rcu_read_lock_held ()); - -/* Check for stale RCU freed inode */ -spin_lock (&ip->i_flags_lock); -if (!ip->i_ino) - goto out_unlock; - -/* -* Skip inodes that are anywhere in the reclaim machinery because we -* drop dquots before tagging an inode for reclamation. -*/ -if (ip->i_flags & (XFS_IRECLAIM |XFS_IRECLAIMABLE )) - goto out_unlock; - -/* -* The inode looks alive; try to grab a VFS reference so that it won't -* get destroyed. If we got the reference, return true to say that -* we grabbed the inode. -* -* If we can't get the reference, then we know the inode had its VFS -* state torn down and hasn't yet entered the reclaim machinery. Since -* we also know that dquots are detached from an inode before it enters -* reclaim, we can skip the inode. -*/ - ret =igrab (VFS_I (ip)) !=NULL ; - -out_unlock: -spin_unlock (&ip->i_flags_lock); -return ret; -} - -/* Drop this inode's dquots. */ -static void -xfs_dqrele_inode ( -struct xfs_inode *ip, -struct xfs_icwalk *icw) -{ -if (xfs_iflags_test (ip,XFS_INEW )) -xfs_inew_wait (ip); - -xfs_ilock (ip,XFS_ILOCK_EXCL ); -if (icw->icw_flags &XFS_ICWALK_FLAG_DROP_UDQUOT ) { -xfs_qm_dqrele (ip->i_udquot); - ip->i_udquot =NULL ; - } -if (icw->icw_flags &XFS_ICWALK_FLAG_DROP_GDQUOT ) { -xfs_qm_dqrele (ip->i_gdquot); - ip->i_gdquot =NULL ; - } -if (icw->icw_flags &XFS_ICWALK_FLAG_DROP_PDQUOT ) { -xfs_qm_dqrele (ip->i_pdquot); - ip->i_pdquot =NULL ; - } -xfs_iunlock (ip,XFS_ILOCK_EXCL ); -xfs_irele (ip); -} - -/* -* Detach all dquots from incore inodes if we can. The caller must already -* have dropped the relevant XFS_[UGP]QUOTA_ACTIVE flags so that dquots will -* not get reattached. -*/ -int -xfs_dqrele_all_inodes ( -struct xfs_mount *mp, -unsigned int qflags) -{ -struct xfs_icwalk icw = { .icw_flags =0 }; - -if (qflags &XFS_UQUOTA_ACCT ) - icw.icw_flags |=XFS_ICWALK_FLAG_DROP_UDQUOT ; -if (qflags &XFS_GQUOTA_ACCT ) - icw.icw_flags |=XFS_ICWALK_FLAG_DROP_GDQUOT ; -if (qflags &XFS_PQUOTA_ACCT ) - icw.icw_flags |=XFS_ICWALK_FLAG_DROP_PDQUOT ; - -return xfs_icwalk (mp,XFS_ICWALK_DQRELE , &icw); -} -#else -# define xfs_dqrele_igrab (ip) (false) -# define xfs_dqrele_inode (ip, priv) ((void)0) -#endif /* CONFIG_XFS_QUOTA */ -/* * Grab the inode for reclaim exclusively. *
@@ -1647,8 +1547,6 @@ xfs_icwalk_igrab( struct xfs_icwalk *icw) {switch (goal) { -case XFS_ICWALK_DQRELE : -return xfs_dqrele_igrab (ip);case XFS_ICWALK_BLOCKGC :return xfs_blockgc_igrab (ip);case XFS_ICWALK_RECLAIM :
@@ -1672,9 +1570,6 @@ xfs_icwalk_process_inode(int error =0 ;switch (goal) { -case XFS_ICWALK_DQRELE : -xfs_dqrele_inode (ip, icw); -break ;case XFS_ICWALK_BLOCKGC : error =xfs_blockgc_scan_inode (ip, icw);break ;
fs/xfs/xfs_icache.h +0 -6
@@ -68,12 +68,6 @@ void xfs_inode_clear_cowblocks_tag(struct xfs_inode *ip);void xfs_blockgc_worker (struct work_struct *work); -#ifdef CONFIG_XFS_QUOTA -int xfs_dqrele_all_inodes (struct xfs_mount *mp,unsigned int qflags); -#else -# define xfs_dqrele_all_inodes (mp, qflags) (0) -#endif -int xfs_icache_inode_is_allocated (struct xfs_mount *mp,struct xfs_trans *tp,xfs_ino_t ino,bool *inuse);
Signature · 1 line
2.30.2
Darrick J. Wong
Reviewed-byRe: [PATCH 1/3] xfs: remove support for disabling quota accounting on a mounted file system
Quoted 12 lines · Christoph Hellwig
Quoted 4 lines · Darrick J. Wong
<snip> I think you could delete more...
...because I think
xfs_dqrele_all_inodeshas lost all of its callers. Can you please remove it andXFS_ICWALK_DQRELEfrom xfs_icache.[ch]?---
Frome8d07e55103636ce3207788e430eeff12b9ef153Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <[email protected]>
Date: Thu, 22 Jul 2021 20:58:55 +0200
Subject: xfs: removexfs_dqrele_all_inodes
Quoted 3 lines
xfs_dqrele_all_inodesis unused now, remove it and all supporting code.Signed-off-by Christoph Hellwig <[email protected]>
For this patch (which I guess is now patch 4?) and the original patch 1,
--D
Quoted 178 lines
--- fs/xfs/xfs_icache.c | 107 +------------------------------------------- fs/xfs/xfs_icache.h | 6 --- 2 files changed, 1 insertion(+), 112 deletions(-)fs/xfs/xfs_icache.c +1
-106@@ -38,9 +38,6 @@* radix tree tags when convenient. Avoid existing XFS_IWALK namespace. */ enum xfs_icwalk_goal { -/* Goals that are not related to tags; these must be < 0. */ -XFS_ICWALK_DQRELE =-1 , -/* Goals directly associated with tagged inodes. */ XFS_ICWALK_BLOCKGC =XFS_ICI_BLOCKGC_TAG ,XFS_ICWALK_RECLAIM =XFS_ICI_RECLAIM_TAG ,@@ -64,9 +61,6 @@ static int xfs_icwalk_ag(struct xfs_perag *pag,* Private inode cache walk flags for struct xfs_icwalk. Must not * coincide with XFS_ICWALK_FLAGS_VALID. */ -#define XFS_ICWALK_FLAG_DROP_UDQUOT (1U << 31) -#define XFS_ICWALK_FLAG_DROP_GDQUOT (1U << 30) -#define XFS_ICWALK_FLAG_DROP_PDQUOT (1U << 29)/* Stop scanning after icw_scan_limit inodes. */ #define XFS_ICWALK_FLAG_SCAN_LIMIT (1U << 28)@@ -74,10 +68,7 @@ static int xfs_icwalk_ag(struct xfs_perag *pag,#define XFS_ICWALK_FLAG_RECLAIM_SICK (1U << 27)#define XFS_ICWALK_FLAG_UNION (1U << 26)/* union filter algorithm */ -#define XFS_ICWALK_PRIVATE_FLAGS (XFS_ICWALK_FLAG_DROP_UDQUOT | \ - XFS_ICWALK_FLAG_DROP_GDQUOT | \ - XFS_ICWALK_FLAG_DROP_PDQUOT | \ - XFS_ICWALK_FLAG_SCAN_LIMIT | \ +#define XFS_ICWALK_PRIVATE_FLAGS (XFS_ICWALK_FLAG_SCAN_LIMIT | \ XFS_ICWALK_FLAG_RECLAIM_SICK | \ XFS_ICWALK_FLAG_UNION)@@ -817,97 +808,6 @@ xfs_icache_inode_is_allocated(return 0 ; } -#ifdef CONFIG_XFS_QUOTA -/* Decide if we want to grab this inode to drop its dquots. */ -static bool -xfs_dqrele_igrab ( -struct xfs_inode *ip) -{ -bool ret = false; - -ASSERT (rcu_read_lock_held ()); - -/* Check for stale RCU freed inode */ -spin_lock (&ip->i_flags_lock); -if (!ip->i_ino) - goto out_unlock; - -/* -* Skip inodes that are anywhere in the reclaim machinery because we -* drop dquots before tagging an inode for reclamation. -*/ -if (ip->i_flags & (XFS_IRECLAIM |XFS_IRECLAIMABLE )) - goto out_unlock; - -/* -* The inode looks alive; try to grab a VFS reference so that it won't -* get destroyed. If we got the reference, return true to say that -* we grabbed the inode. -* -* If we can't get the reference, then we know the inode had its VFS -* state torn down and hasn't yet entered the reclaim machinery. Since -* we also know that dquots are detached from an inode before it enters -* reclaim, we can skip the inode. -*/ - ret =igrab (VFS_I (ip)) !=NULL ; - -out_unlock: -spin_unlock (&ip->i_flags_lock); -return ret; -} - -/* Drop this inode's dquots. */ -static void -xfs_dqrele_inode ( -struct xfs_inode *ip, -struct xfs_icwalk *icw) -{ -if (xfs_iflags_test (ip,XFS_INEW )) -xfs_inew_wait (ip); - -xfs_ilock (ip,XFS_ILOCK_EXCL ); -if (icw->icw_flags &XFS_ICWALK_FLAG_DROP_UDQUOT ) { -xfs_qm_dqrele (ip->i_udquot); - ip->i_udquot =NULL ; - } -if (icw->icw_flags &XFS_ICWALK_FLAG_DROP_GDQUOT ) { -xfs_qm_dqrele (ip->i_gdquot); - ip->i_gdquot =NULL ; - } -if (icw->icw_flags &XFS_ICWALK_FLAG_DROP_PDQUOT ) { -xfs_qm_dqrele (ip->i_pdquot); - ip->i_pdquot =NULL ; - } -xfs_iunlock (ip,XFS_ILOCK_EXCL ); -xfs_irele (ip); -} - -/* -* Detach all dquots from incore inodes if we can. The caller must already -* have dropped the relevant XFS_[UGP]QUOTA_ACTIVE flags so that dquots will -* not get reattached. -*/ -int -xfs_dqrele_all_inodes ( -struct xfs_mount *mp, -unsigned int qflags) -{ -struct xfs_icwalk icw = { .icw_flags =0 }; - -if (qflags &XFS_UQUOTA_ACCT ) - icw.icw_flags |=XFS_ICWALK_FLAG_DROP_UDQUOT ; -if (qflags &XFS_GQUOTA_ACCT ) - icw.icw_flags |=XFS_ICWALK_FLAG_DROP_GDQUOT ; -if (qflags &XFS_PQUOTA_ACCT ) - icw.icw_flags |=XFS_ICWALK_FLAG_DROP_PDQUOT ; - -return xfs_icwalk (mp,XFS_ICWALK_DQRELE , &icw); -} -#else -# define xfs_dqrele_igrab (ip) (false) -# define xfs_dqrele_inode (ip, priv) ((void)0) -#endif /* CONFIG_XFS_QUOTA */ -/* * Grab the inode for reclaim exclusively. * @@ -1647,8 +1547,6 @@ xfs_icwalk_igrab( struct xfs_icwalk *icw) {switch (goal) { -case XFS_ICWALK_DQRELE : -return xfs_dqrele_igrab (ip);case XFS_ICWALK_BLOCKGC :return xfs_blockgc_igrab (ip);case XFS_ICWALK_RECLAIM :@@ -1672,9 +1570,6 @@ xfs_icwalk_process_inode(int error =0 ;switch (goal) { -case XFS_ICWALK_DQRELE : -xfs_dqrele_inode (ip, icw); -break ;case XFS_ICWALK_BLOCKGC : error =xfs_blockgc_scan_inode (ip, icw);break ;fs/xfs/xfs_icache.h +0
-6@@ -68,12 +68,6 @@ void xfs_inode_clear_cowblocks_tag(struct xfs_inode *ip);void xfs_blockgc_worker (struct work_struct *work); -#ifdef CONFIG_XFS_QUOTA -int xfs_dqrele_all_inodes (struct xfs_mount *mp,unsigned int qflags); -#else -# define xfs_dqrele_all_inodes (mp, qflags) (0) -#endif -int xfs_icache_inode_is_allocated (struct xfs_mount *mp,struct xfs_trans *tp,xfs_ino_t ino,bool *inuse);Signature · 1 line
2.30.2
Re: [PATCH 1/3] xfs: remove support for disabling quota accounting on a mounted file system
Quoted 2 lines · Darrick J. Wong
For this patch (which I guess is now patch 4?) and the original patch 1,
Reviewed-by Darrick J. Wong <[email protected]>
I'll probably make it patch 2 when I resend. I'll wait a bit for more comments, though.
PATCH 2/3 xfs: remove the flags argument to xfs_qm_dquot_walk
In reply to Christoph HellwigWe always purge all dquots now, so drop the argument.
--- fs/xfs/xfs_qm.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
fs/xfs/xfs_qm.c +6 -10
@@ -187,15 +187,11 @@ xfs_qm_dqpurge(*/ static void xfs_qm_dqpurge_all ( -struct xfs_mount *mp, -uint flags) +struct xfs_mount *mp) { -if (flags &XFS_QMOPT_UQUOTA ) -xfs_qm_dquot_walk (mp,XFS_DQTYPE_USER , xfs_qm_dqpurge,NULL ); -if (flags &XFS_QMOPT_GQUOTA ) -xfs_qm_dquot_walk (mp,XFS_DQTYPE_GROUP , xfs_qm_dqpurge,NULL ); -if (flags &XFS_QMOPT_PQUOTA ) -xfs_qm_dquot_walk (mp,XFS_DQTYPE_PROJ , xfs_qm_dqpurge,NULL ); +xfs_qm_dquot_walk (mp,XFS_DQTYPE_USER , xfs_qm_dqpurge,NULL ); +xfs_qm_dquot_walk (mp,XFS_DQTYPE_GROUP , xfs_qm_dqpurge,NULL ); +xfs_qm_dquot_walk (mp,XFS_DQTYPE_PROJ , xfs_qm_dqpurge,NULL ); }/*
@@ -206,7 +202,7 @@ xfs_qm_unmount( struct xfs_mount *mp) {if (mp->m_quotainfo) { -xfs_qm_dqpurge_all (mp,XFS_QMOPT_QUOTALL ); +xfs_qm_dqpurge_all (mp);xfs_qm_destroy_quotainfo (mp); } }
@@ -1359,7 +1355,7 @@ xfs_qm_quotacheck(* at this point (because we intentionally didn't in dqget_noattach). */ if (error) { -xfs_qm_dqpurge_all (mp,XFS_QMOPT_QUOTALL ); +xfs_qm_dqpurge_all (mp); goto error_return; }
Signature · 1 line
2.30.2
PATCH 3/3 xfs: remove the active vs running quota differentiation
In reply to Christoph HellwigThese only made a difference when quotaoff supported disabling quota accounting on a mounted file system, so we can switch everyone to use a single set of flags and helpers now. Note that the *QUOTA_ON naming for the helpers is kept as it was the much more commonly used one.
--- fs/xfs/libxfs/xfs_quota_defs.h | 30 +++----------------- fs/xfs/scrub/quota.c | 2 +- fs/xfs/xfs_dquot.c | 3 -- fs/xfs/xfs_ioctl.c | 2 +- fs/xfs/xfs_iops.c | 4 +-- fs/xfs/xfs_mount.c | 4 +-- fs/xfs/xfs_qm.c | 26 ++++++++--------- fs/xfs/xfs_qm_syscalls.c | 2 +- fs/xfs/xfs_quotaops.c | 30 +++++++------------- fs/xfs/xfs_super.c | 51 ++++++++++++++-------------------- fs/xfs/xfs_trans_dquot.c | 11 ++++---- 11 files changed, 58 insertions(+), 107 deletions(-)
fs/xfs/libxfs/xfs_quota_defs.h +4 -26
@@ -60,36 +60,14 @@ typedef uint8_t xfs_dqtype_t;#define XFS_DQUOT_LOGRES (mp) \ ((sizeof(struct xfs_dq_logformat) + sizeof(struct xfs_disk_dquot)) * 6) -#define XFS_IS_QUOTA_RUNNING (mp) ((mp)->m_qflags & XFS_ALL_QUOTA_ACCT) -#define XFS_IS_UQUOTA_RUNNING (mp) ((mp)->m_qflags & XFS_UQUOTA_ACCT) -#define XFS_IS_PQUOTA_RUNNING (mp) ((mp)->m_qflags & XFS_PQUOTA_ACCT) -#define XFS_IS_GQUOTA_RUNNING (mp) ((mp)->m_qflags & XFS_GQUOTA_ACCT) +#define XFS_IS_QUOTA_ON (mp) ((mp)->m_qflags & XFS_ALL_QUOTA_ACCT) +#define XFS_IS_UQUOTA_ON (mp) ((mp)->m_qflags & XFS_UQUOTA_ACCT) +#define XFS_IS_PQUOTA_ON (mp) ((mp)->m_qflags & XFS_PQUOTA_ACCT) +#define XFS_IS_GQUOTA_ON (mp) ((mp)->m_qflags & XFS_GQUOTA_ACCT)#define XFS_IS_UQUOTA_ENFORCED (mp) ((mp)->m_qflags & XFS_UQUOTA_ENFD)#define XFS_IS_GQUOTA_ENFORCED (mp) ((mp)->m_qflags & XFS_GQUOTA_ENFD)#define XFS_IS_PQUOTA_ENFORCED (mp) ((mp)->m_qflags & XFS_PQUOTA_ENFD) -/* -* Incore only flags for quotaoff - these bits get cleared when quota(s) -* are in the process of getting turned off. These flags are in m_qflags but -* never in sb_qflags. -*/ -#define XFS_UQUOTA_ACTIVE 0x1000/* uquotas are being turned off */ -#define XFS_GQUOTA_ACTIVE 0x2000/* gquotas are being turned off */ -#define XFS_PQUOTA_ACTIVE 0x4000/* pquotas are being turned off */ -#define XFS_ALL_QUOTA_ACTIVE \ - (XFS_UQUOTA_ACTIVE | XFS_GQUOTA_ACTIVE | XFS_PQUOTA_ACTIVE) - -/* -* Checking XFS_IS_*QUOTA_ON() while holding any inode lock guarantees -* quota will be not be switched off as long as that inode lock is held. -*/ -#define XFS_IS_QUOTA_ON (mp) ((mp)->m_qflags & (XFS_UQUOTA_ACTIVE | \ - XFS_GQUOTA_ACTIVE | \ - XFS_PQUOTA_ACTIVE)) -#define XFS_IS_UQUOTA_ON (mp) ((mp)->m_qflags & XFS_UQUOTA_ACTIVE) -#define XFS_IS_GQUOTA_ON (mp) ((mp)->m_qflags & XFS_GQUOTA_ACTIVE) -#define XFS_IS_PQUOTA_ON (mp) ((mp)->m_qflags & XFS_PQUOTA_ACTIVE) -/* * Flags to tell various functions what to do. Not all of these are meaningful * to a single function. None of these XFS_QMOPT_* flags are meant to have
fs/xfs/scrub/quota.c +1 -1
@@ -42,7 +42,7 @@ xchk_setup_quota(xfs_dqtype_t dqtype;int error; -if (!XFS_IS_QUOTA_RUNNING (sc->mp) || !XFS_IS_QUOTA_ON (sc->mp)) +if (!XFS_IS_QUOTA_ON (sc->mp))return -ENOENT ; dqtype =xchk_quota_to_dqtype (sc);
fs/xfs/xfs_dquot.c +0 -3
@@ -847,9 +847,6 @@ xfs_qm_dqget_checks( struct xfs_mount *mp, xfs_dqtype_t type) { - if (WARN_ON_ONCE(!XFS_IS_QUOTA_RUNNING(mp))) - return -ESRCH; - switch (type) {case XFS_DQTYPE_USER :if (!XFS_IS_UQUOTA_ON (mp))
fs/xfs/xfs_ioctl.c +1 -1
@@ -1450,7 +1450,7 @@ xfs_fileattr_set(/* Change the ownerships and register project quota modifications */ if (ip->i_projid != fa->fsx_projid) { -if (XFS_IS_QUOTA_RUNNING (mp) &&XFS_IS_PQUOTA_ON (mp)) { +if (XFS_IS_PQUOTA_ON (mp)) { olddquot =xfs_qm_vop_chown (tp, ip, &ip->i_pdquot, pdqp); }
fs/xfs/xfs_iops.c +2 -2
@@ -778,7 +778,7 @@ xfs_setattr_nonsize(* in the transaction. */ if (!uid_eq (iuid, uid)) { -if (XFS_IS_QUOTA_RUNNING (mp) &&XFS_IS_UQUOTA_ON (mp)) { +if (XFS_IS_UQUOTA_ON (mp)) {ASSERT (mask &ATTR_UID );ASSERT (udqp); olddquot1 = xfs_qm_vop_chown(tp, ip,
@@ -787,7 +787,7 @@ xfs_setattr_nonsize( inode->i_uid = uid; }if (!gid_eq (igid, gid)) { -if (XFS_IS_QUOTA_RUNNING (mp) &&XFS_IS_GQUOTA_ON (mp)) { +if (XFS_IS_GQUOTA_ON (mp)) {ASSERT (xfs_sb_version_has_pquotino (&mp->m_sb) || !XFS_IS_PQUOTA_ON (mp));ASSERT (mask &ATTR_GID );
fs/xfs/xfs_mount.c +1 -3
@@ -836,13 +836,11 @@ xfs_mountfs(/* * Initialise the XFS quota management subsystem for this mount */ -if (XFS_IS_QUOTA_RUNNING (mp)) { +if (XFS_IS_QUOTA_ON (mp)) { error =xfs_qm_newmount (mp, "amount, "aflags);if (error) goto out_rtunmount; }else { -ASSERT (!XFS_IS_QUOTA_ON (mp)); -/* * If a file system had quotas running earlier, but decided to * mount without -o uquota/pquota/gquota options, revoke the
fs/xfs/xfs_qm.c +12 -14
@@ -295,8 +295,6 @@ xfs_qm_need_dqattach( {struct xfs_mount *mp = ip->i_mount; -if (!XFS_IS_QUOTA_RUNNING (mp)) -return false;if (!XFS_IS_QUOTA_ON (mp))return false;if (!XFS_NOT_DQATTACHED (mp, ip))
@@ -631,7 +629,7 @@ xfs_qm_init_quotainfo(struct xfs_quotainfo *qinf;int error; -ASSERT (XFS_IS_QUOTA_RUNNING (mp)); +ASSERT (XFS_IS_QUOTA_ON (mp)); qinf = mp->m_quotainfo =kmem_zalloc (sizeof (struct xfs_quotainfo ),0 );
@@ -676,11 +674,11 @@ xfs_qm_init_quotainfo(xfs_qm_init_timelimits (mp,XFS_DQTYPE_GROUP );xfs_qm_init_timelimits (mp,XFS_DQTYPE_PROJ ); -if (XFS_IS_UQUOTA_RUNNING (mp)) +if (XFS_IS_UQUOTA_ON (mp))xfs_qm_set_defquota (mp,XFS_DQTYPE_USER , qinf); -if (XFS_IS_GQUOTA_RUNNING (mp)) +if (XFS_IS_GQUOTA_ON (mp))xfs_qm_set_defquota (mp,XFS_DQTYPE_GROUP , qinf); -if (XFS_IS_PQUOTA_RUNNING (mp)) +if (XFS_IS_PQUOTA_ON (mp))xfs_qm_set_defquota (mp,XFS_DQTYPE_PROJ , qinf); qinf->qi_shrinker.count_objects = xfs_qm_shrink_count;
@@ -1143,7 +1141,7 @@ xfs_qm_dqusage_adjust(xfs_filblks_t rtblks =0 ;/* total rt blks */ int error; -ASSERT (XFS_IS_QUOTA_RUNNING (mp)); +ASSERT (XFS_IS_QUOTA_ON (mp));/* * rootino must have its resources accounted for, not so with the quota
@@ -1284,7 +1282,7 @@ xfs_qm_quotacheck( flags =0 ;ASSERT (uip || gip || pip); -ASSERT (XFS_IS_QUOTA_RUNNING (mp)); +ASSERT (XFS_IS_QUOTA_ON (mp));xfs_notice (mp,"Quotacheck needed: Please wait." );
@@ -1414,7 +1412,7 @@ xfs_qm_mount_quotas( goto write_changes; } -ASSERT (XFS_IS_QUOTA_RUNNING (mp)); +ASSERT (XFS_IS_QUOTA_ON (mp));/* * Allocate the quotainfo structure inside the mount struct, and
@@ -1469,7 +1467,7 @@ xfs_qm_mount_quotas(* the incore structures are convinced that quotas are * off, but the on disk superblock doesn't know that ! */ -ASSERT (!(XFS_IS_QUOTA_RUNNING (mp))); +ASSERT (!(XFS_IS_QUOTA_ON (mp)));xfs_alert (mp,"%s: Superblock update failed!" , __func__); }
@@ -1641,7 +1639,7 @@ xfs_qm_vop_dqalloc(int error;uint lockflags; -if (!XFS_IS_QUOTA_RUNNING (mp) || !XFS_IS_QUOTA_ON (mp)) +if (!XFS_IS_QUOTA_ON (mp))return 0 ; lockflags =XFS_ILOCK_EXCL ;
@@ -1772,7 +1770,7 @@ xfs_qm_vop_chown(ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL )); -ASSERT (XFS_IS_QUOTA_RUNNING (ip->i_mount)); +ASSERT (XFS_IS_QUOTA_ON (ip->i_mount));/* old dquot */ prevdq = *IO_olddq;
@@ -1825,7 +1823,7 @@ xfs_qm_vop_rename_dqattach(struct xfs_mount *mp = i_tab[0 ]->i_mount;int i; -if (!XFS_IS_QUOTA_RUNNING (mp) || !XFS_IS_QUOTA_ON (mp)) +if (!XFS_IS_QUOTA_ON (mp))return 0 ;for (i =0 ; (i <4 && i_tab[i]); i++) {
@@ -1856,7 +1854,7 @@ xfs_qm_vop_create_dqattach( {struct xfs_mount *mp = tp->t_mountp; -if (!XFS_IS_QUOTA_RUNNING (mp) || !XFS_IS_QUOTA_ON (mp)) +if (!XFS_IS_QUOTA_ON (mp))return ;ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL ));
fs/xfs/xfs_qm_syscalls.c +1 -1
@@ -204,7 +204,7 @@ xfs_qm_scall_quotaon( (mp->m_qflags & XFS_GQUOTA_ACCT)))return 0 ; -if (!XFS_IS_QUOTA_RUNNING (mp)) +if (!XFS_IS_QUOTA_ON (mp))return -ESRCH ;/*
fs/xfs/xfs_quotaops.c +10 -20
@@ -60,18 +60,18 @@ xfs_fs_get_quota_state(struct xfs_quotainfo *q = mp->m_quotainfo;memset (state,0 ,sizeof (*state)); -if (!XFS_IS_QUOTA_RUNNING (mp)) +if (!XFS_IS_QUOTA_ON (mp))return 0 ; state->s_incoredqs = q->qi_dquots; -if (XFS_IS_UQUOTA_RUNNING (mp)) +if (XFS_IS_UQUOTA_ON (mp)) state->s_state[USRQUOTA ].flags |=QCI_ACCT_ENABLED ;if (XFS_IS_UQUOTA_ENFORCED (mp)) state->s_state[USRQUOTA ].flags |=QCI_LIMITS_ENFORCED ; -if (XFS_IS_GQUOTA_RUNNING (mp)) +if (XFS_IS_GQUOTA_ON (mp)) state->s_state[GRPQUOTA ].flags |=QCI_ACCT_ENABLED ;if (XFS_IS_GQUOTA_ENFORCED (mp)) state->s_state[GRPQUOTA ].flags |=QCI_LIMITS_ENFORCED ; -if (XFS_IS_PQUOTA_RUNNING (mp)) +if (XFS_IS_PQUOTA_ON (mp)) state->s_state[PRJQUOTA ].flags |=QCI_ACCT_ENABLED ;if (XFS_IS_PQUOTA_ENFORCED (mp)) state->s_state[PRJQUOTA ].flags |=QCI_LIMITS_ENFORCED ;
@@ -114,10 +114,8 @@ xfs_fs_set_info(if (sb_rdonly (sb))return -EROFS ; -if (!XFS_IS_QUOTA_RUNNING (mp)) -return -ENOSYS ;if (!XFS_IS_QUOTA_ON (mp)) -return -ESRCH ; +return -ENOSYS ;if (info->i_fieldmask & ~XFS_QC_SETINFO_MASK )return -EINVAL ;if ((info->i_fieldmask &XFS_QC_SETINFO_MASK ) ==0 )
@@ -164,7 +162,7 @@ xfs_quota_enable(if (sb_rdonly (sb))return -EROFS ; -if (!XFS_IS_QUOTA_RUNNING (mp)) +if (!XFS_IS_QUOTA_ON (mp))return -ENOSYS ;return xfs_qm_scall_quotaon (mp,xfs_quota_flags (uflags));
@@ -179,10 +177,8 @@ xfs_quota_disable(if (sb_rdonly (sb))return -EROFS ; -if (!XFS_IS_QUOTA_RUNNING (mp)) -return -ENOSYS ;if (!XFS_IS_QUOTA_ON (mp)) -return -EINVAL ; +return -ENOSYS ;return xfs_qm_scall_quotaoff (mp,xfs_quota_flags (uflags)); }
@@ -223,10 +219,8 @@ xfs_fs_get_dqblk(struct xfs_mount *mp =XFS_M (sb);xfs_dqid_t id; -if (!XFS_IS_QUOTA_RUNNING (mp)) -return -ENOSYS ;if (!XFS_IS_QUOTA_ON (mp)) -return -ESRCH ; +return -ENOSYS ; id =from_kqid (&init_user_ns, qid);return xfs_qm_scall_getquota (mp, id,xfs_quota_type (qid.type), qdq);
@@ -243,10 +237,8 @@ xfs_fs_get_nextdqblk(struct xfs_mount *mp =XFS_M (sb);xfs_dqid_t id; -if (!XFS_IS_QUOTA_RUNNING (mp)) -return -ENOSYS ;if (!XFS_IS_QUOTA_ON (mp)) -return -ESRCH ; +return -ENOSYS ; id =from_kqid (&init_user_ns, *qid); ret = xfs_qm_scall_getquota_next(mp, &id, xfs_quota_type(qid->type),
@@ -269,10 +261,8 @@ xfs_fs_set_dqblk(if (sb_rdonly (sb))return -EROFS ; -if (!XFS_IS_QUOTA_RUNNING (mp)) -return -ENOSYS ;if (!XFS_IS_QUOTA_ON (mp)) -return -ESRCH ; +return -ENOSYS ;return xfs_qm_scall_setqlim (mp,from_kqid (&init_user_ns, qid),xfs_quota_type (qid.type), qdq);
fs/xfs/xfs_super.c +21 -30
89 lines not on this page · raw message
fs/xfs/xfs_trans_dquot.c +5 -6
@@ -132,8 +132,7 @@ xfs_trans_mod_dquot_byino( {xfs_mount_t *mp = tp->t_mountp; -if (!XFS_IS_QUOTA_RUNNING (mp) || - !XFS_IS_QUOTA_ON (mp) || +if (!XFS_IS_QUOTA_ON (mp) ||xfs_is_quota_inode (&mp->m_sb, ip->i_ino))return ;
@@ -192,7 +191,7 @@ xfs_trans_mod_dquot(struct xfs_dqtrx *qtrx;ASSERT (tp); -ASSERT (XFS_IS_QUOTA_RUNNING (tp->t_mountp)); +ASSERT (XFS_IS_QUOTA_ON (tp->t_mountp)); qtrx =NULL ;if (!delta)
@@ -738,7 +737,7 @@ xfs_trans_reserve_quota_bydquots( {int error; -if (!XFS_IS_QUOTA_RUNNING (mp) || !XFS_IS_QUOTA_ON (mp)) +if (!XFS_IS_QUOTA_ON (mp))return 0 ;ASSERT (flags &XFS_QMOPT_RESBLK_MASK );
@@ -795,7 +794,7 @@ xfs_trans_reserve_quota_nblks(unsigned int qflags =0 ;int error; -if (!XFS_IS_QUOTA_RUNNING (mp) || !XFS_IS_QUOTA_ON (mp)) +if (!XFS_IS_QUOTA_ON (mp))return 0 ;ASSERT (!xfs_is_quota_inode (&mp->m_sb, ip->i_ino));
@@ -836,7 +835,7 @@ xfs_trans_reserve_quota_icreate( {struct xfs_mount *mp = tp->t_mountp; -if (!XFS_IS_QUOTA_RUNNING (mp) || !XFS_IS_QUOTA_ON (mp)) +if (!XFS_IS_QUOTA_ON (mp))return 0 ; return xfs_trans_reserve_quota_bydquots(tp, mp, udqp, gdqp, pdqp,
Signature · 1 line
2.30.2