xfs: queue inactivation immediately when quota is nearing enforcement
Now that we have made the inactivation of unlinked inodes a background task to increase the throughput of file deletions, we need to be a little more careful about how long of a delay we can tolerate. Specifically, if the dquots attached to the inode being inactivated are nearing any kind of enforcement boundary, we want to queue that inactivation work immediately so that users don't get EDQUOT/ENOSPC errors even after they deleted a bunch of files to stay within quota. Signed-off-by: Darrick J. Wong <djwong@kernel.org> Reviewed-by: Dave Chinner <dchinner@redhat.com>
This commit is contained in:
parent
7d6f07d2c5
commit
108523b8de
@ -54,6 +54,16 @@ struct xfs_dquot_res {
|
|||||||
xfs_qwarncnt_t warnings;
|
xfs_qwarncnt_t warnings;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static inline bool
|
||||||
|
xfs_dquot_res_over_limits(
|
||||||
|
const struct xfs_dquot_res *qres)
|
||||||
|
{
|
||||||
|
if ((qres->softlimit && qres->softlimit < qres->reserved) ||
|
||||||
|
(qres->hardlimit && qres->hardlimit < qres->reserved))
|
||||||
|
return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The incore dquot structure
|
* The incore dquot structure
|
||||||
*/
|
*/
|
||||||
|
@ -1921,6 +1921,7 @@ xfs_inodegc_start(
|
|||||||
*
|
*
|
||||||
* - We've accumulated more than one inode cluster buffer's worth of inodes.
|
* - We've accumulated more than one inode cluster buffer's worth of inodes.
|
||||||
* - There is less than 5% free space left.
|
* - There is less than 5% free space left.
|
||||||
|
* - Any of the quotas for this inode are near an enforcement limit.
|
||||||
*/
|
*/
|
||||||
static inline bool
|
static inline bool
|
||||||
xfs_inodegc_want_queue_work(
|
xfs_inodegc_want_queue_work(
|
||||||
@ -1937,6 +1938,15 @@ xfs_inodegc_want_queue_work(
|
|||||||
XFS_FDBLOCKS_BATCH) < 0)
|
XFS_FDBLOCKS_BATCH) < 0)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
if (xfs_inode_near_dquot_enforcement(ip, XFS_DQTYPE_USER))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
if (xfs_inode_near_dquot_enforcement(ip, XFS_DQTYPE_GROUP))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
if (xfs_inode_near_dquot_enforcement(ip, XFS_DQTYPE_PROJ))
|
||||||
|
return true;
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1882,3 +1882,37 @@ xfs_qm_vop_create_dqattach(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Decide if this inode's dquot is near an enforcement boundary. */
|
||||||
|
bool
|
||||||
|
xfs_inode_near_dquot_enforcement(
|
||||||
|
struct xfs_inode *ip,
|
||||||
|
xfs_dqtype_t type)
|
||||||
|
{
|
||||||
|
struct xfs_dquot *dqp;
|
||||||
|
int64_t freesp;
|
||||||
|
|
||||||
|
/* We only care for quotas that are enabled and enforced. */
|
||||||
|
dqp = xfs_inode_dquot(ip, type);
|
||||||
|
if (!dqp || !xfs_dquot_is_enforced(dqp))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (xfs_dquot_res_over_limits(&dqp->q_ino) ||
|
||||||
|
xfs_dquot_res_over_limits(&dqp->q_rtb))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
/* For space on the data device, check the various thresholds. */
|
||||||
|
if (!dqp->q_prealloc_hi_wmark)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (dqp->q_blk.reserved < dqp->q_prealloc_lo_wmark)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (dqp->q_blk.reserved >= dqp->q_prealloc_hi_wmark)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
freesp = dqp->q_prealloc_hi_wmark - dqp->q_blk.reserved;
|
||||||
|
if (freesp < dqp->q_low_space[XFS_QLOWSP_5_PCNT])
|
||||||
|
return true;
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
@ -113,6 +113,7 @@ xfs_quota_reserve_blkres(struct xfs_inode *ip, int64_t blocks)
|
|||||||
{
|
{
|
||||||
return xfs_trans_reserve_quota_nblks(NULL, ip, blocks, 0, false);
|
return xfs_trans_reserve_quota_nblks(NULL, ip, blocks, 0, false);
|
||||||
}
|
}
|
||||||
|
bool xfs_inode_near_dquot_enforcement(struct xfs_inode *ip, xfs_dqtype_t type);
|
||||||
#else
|
#else
|
||||||
static inline int
|
static inline int
|
||||||
xfs_qm_vop_dqalloc(struct xfs_inode *ip, kuid_t kuid, kgid_t kgid,
|
xfs_qm_vop_dqalloc(struct xfs_inode *ip, kuid_t kuid, kgid_t kgid,
|
||||||
@ -168,6 +169,7 @@ xfs_trans_reserve_quota_icreate(struct xfs_trans *tp, struct xfs_dquot *udqp,
|
|||||||
#define xfs_qm_mount_quotas(mp)
|
#define xfs_qm_mount_quotas(mp)
|
||||||
#define xfs_qm_unmount(mp)
|
#define xfs_qm_unmount(mp)
|
||||||
#define xfs_qm_unmount_quotas(mp)
|
#define xfs_qm_unmount_quotas(mp)
|
||||||
|
#define xfs_inode_near_dquot_enforcement(ip, type) (false)
|
||||||
#endif /* CONFIG_XFS_QUOTA */
|
#endif /* CONFIG_XFS_QUOTA */
|
||||||
|
|
||||||
static inline int
|
static inline int
|
||||||
|
Loading…
Reference in New Issue
Block a user