xfs: preserve default grace interval during quotacheck
PATCH v2 1/1 xfs: preserve default grace interval during quotacheck
From: Darrick J. Wong <[email protected]>
When quotacheck runs, it zeroes all the timer fields in every dquot. Unfortunately, it also does this to the root dquot, which erases any preconfigured grace intervals and warning limits that the administrator may have set. Worse yet, the incore copies of those variables remain set. This cache coherence problem manifests itself as the grace interval mysteriously being reset back to the defaults at the /next/ mount.
Fix it by not resetting the root disk dquot's timer and warning fields.
---
v2: just use a branch
--- fs/xfs/xfs_qm.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
fs/xfs/xfs_qm.c +14 -6
@@ -889,12 +889,20 @@ xfs_qm_reset_dqcounts( ddq->d_bcount =0 ; ddq->d_icount =0 ; ddq->d_rtbcount =0 ; - ddq->d_btimer =0 ; - ddq->d_itimer =0 ; - ddq->d_rtbtimer =0 ; - ddq->d_bwarns =0 ; - ddq->d_iwarns =0 ; - ddq->d_rtbwarns =0 ; + +/* +* dquot id 0 stores the default grace period and the maximum +* warning limit that were set by the administrator, so we +* should not reset them. +*/ +if (ddq->d_id !=0 ) { + ddq->d_btimer =0 ; + ddq->d_itimer =0 ; + ddq->d_rtbtimer =0 ; + ddq->d_bwarns =0 ; + ddq->d_iwarns =0 ; + ddq->d_rtbwarns =0 ; + }if (xfs_sb_version_hascrc (&mp->m_sb)) { xfs_update_cksum((char *)&dqb[j],
Quoted 10 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
When quotacheck runs, it zeroes all the timer fields in every dquot. Unfortunately, it also does this to the root dquot, which erases any preconfigured grace intervals and warning limits that the administrator may have set. Worse yet, the incore copies of those variables remain set. This cache coherence problem manifests itself as the grace interval mysteriously being reset back to the defaults at the /next/ mount.
Quoted 3 lines
Fix it by not resetting the root disk dquot's timer and warning fields.
Signed-off-by Darrick J. Wong <[email protected]>
Looks fine.
Signature · 2 lines
Dave Chinner [email protected]
Quoted 10 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
When quotacheck runs, it zeroes all the timer fields in every dquot. Unfortunately, it also does this to the root dquot, which erases any preconfigured grace intervals and warning limits that the administrator may have set. Worse yet, the incore copies of those variables remain set. This cache coherence problem manifests itself as the grace interval mysteriously being reset back to the defaults at the /next/ mount.
Quoted 3 lines
Fix it by not resetting the root disk dquot's timer and warning fields.
Signed-off-by Darrick J. Wong <[email protected]>
Looks good, although a comment in the code about the special nature of qid 0 might be useful. Otherwise: