From: Chandan Babu R <chandan.babu@oracle.com>
To: gregkh@linuxfoundation.org
Cc: sashal@kernel.org, mcgrof@kernel.org, linux-xfs@vger.kernel.org,
stable@vger.kernel.org, djwong@kernel.org,
chandan.babu@oracle.com, amir73il@gmail.com,
leah.rumancik@gmail.com
Subject: [PATCH 5.4 16/26] xfs: preserve default grace interval during quotacheck
Date: Wed, 26 Oct 2022 11:58:33 +0530 [thread overview]
Message-ID: <20221026062843.927600-17-chandan.babu@oracle.com> (raw)
In-Reply-To: <20221026062843.927600-1-chandan.babu@oracle.com>
From: "Darrick J. Wong" <darrick.wong@oracle.com>
commit 5885539f0af371024d07afd14974bfdc3fff84c5 upstream.
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.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Acked-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandan.babu@oracle.com>
---
fs/xfs/xfs_qm.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index 035930a4f0dd..fe93e044d81b 100644
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -875,12 +875,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],
--
2.35.1
next prev parent reply other threads:[~2022-10-26 6:30 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-26 6:28 [PATCH 5.4 00/26] xfs stable candidate patches for 5.4.y (from v5.7) Chandan Babu R
2022-10-26 6:28 ` [PATCH 5.4 01/26] xfs: open code insert range extent split helper Chandan Babu R
2022-10-26 6:28 ` [PATCH 5.4 02/26] xfs: rework insert range into an atomic operation Chandan Babu R
2022-10-26 6:28 ` [PATCH 5.4 03/26] xfs: rework collapse " Chandan Babu R
2022-10-26 6:28 ` [PATCH 5.4 04/26] xfs: add a function to deal with corrupt buffers post-verifiers Chandan Babu R
2022-10-26 6:28 ` [PATCH 5.4 05/26] xfs: xfs_buf_corruption_error should take __this_address Chandan Babu R
2022-10-26 6:28 ` [PATCH 5.4 06/26] xfs: fix buffer corruption reporting when xfs_dir3_free_header_check fails Chandan Babu R
2022-10-26 6:28 ` [PATCH 5.4 07/26] xfs: check owner of dir3 data blocks Chandan Babu R
2022-10-26 6:28 ` [PATCH 5.4 08/26] xfs: check owner of dir3 blocks Chandan Babu R
2022-10-26 6:28 ` [PATCH 5.4 09/26] xfs: Use scnprintf() for avoiding potential buffer overflow Chandan Babu R
2022-10-26 6:28 ` [PATCH 5.4 10/26] xfs: remove the xfs_disk_dquot_t and xfs_dquot_t Chandan Babu R
2022-10-26 6:28 ` [PATCH 5.4 11/26] xfs: remove the xfs_dq_logitem_t typedef Chandan Babu R
2022-10-26 6:28 ` [PATCH 5.4 12/26] xfs: remove the xfs_qoff_logitem_t typedef Chandan Babu R
2022-10-26 6:28 ` [PATCH 5.4 13/26] xfs: Replace function declaration by actual definition Chandan Babu R
2022-10-26 6:28 ` [PATCH 5.4 14/26] xfs: factor out quotaoff intent AIL removal and memory free Chandan Babu R
2022-10-26 6:28 ` [PATCH 5.4 15/26] xfs: fix unmount hang and memory leak on shutdown during quotaoff Chandan Babu R
2022-10-26 6:28 ` Chandan Babu R [this message]
2022-10-26 6:28 ` [PATCH 5.4 17/26] xfs: Lower CIL flush limit for large logs Chandan Babu R
2022-10-26 6:28 ` [PATCH 5.4 18/26] xfs: Throttle commits on delayed background CIL push Chandan Babu R
2022-10-26 6:28 ` [PATCH 5.4 19/26] xfs: factor common AIL item deletion code Chandan Babu R
2022-10-26 6:28 ` [PATCH 5.4 20/26] xfs: tail updates only need to occur when LSN changes Chandan Babu R
2022-10-26 6:28 ` [PATCH 5.4 21/26] xfs: don't write a corrupt unmount record to force summary counter recalc Chandan Babu R
2022-10-26 6:28 ` [PATCH 5.4 22/26] xfs: trylock underlying buffer on dquot flush Chandan Babu R
2022-10-26 6:28 ` [PATCH 5.4 23/26] xfs: factor out a new xfs_log_force_inode helper Chandan Babu R
2022-10-26 6:28 ` [PATCH 5.4 24/26] xfs: reflink should force the log out if mounted with wsync Chandan Babu R
2022-10-26 6:28 ` [PATCH 5.4 25/26] xfs: move inode flush to the sync workqueue Chandan Babu R
2022-10-26 6:28 ` [PATCH 5.4 26/26] xfs: fix use-after-free on CIL context on shutdown Chandan Babu R
2022-10-26 14:52 ` [PATCH 5.4 00/26] xfs stable candidate patches for 5.4.y (from v5.7) Greg KH
2022-10-27 14:58 ` Greg KH
2022-10-27 15:28 ` Chandan Babu R
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221026062843.927600-17-chandan.babu@oracle.com \
--to=chandan.babu@oracle.com \
--cc=amir73il@gmail.com \
--cc=djwong@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=leah.rumancik@gmail.com \
--cc=linux-xfs@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.