From: Chandan Babu R <chandanrlinux@gmail.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 03/18] xfs: validate ondisk/incore dquot flags
Date: Wed, 01 Jul 2020 14:03:10 +0530 [thread overview]
Message-ID: <2301729.XddXFWAJP6@garuda> (raw)
In-Reply-To: <159353172899.2864738.6438709598863248951.stgit@magnolia>
On Tuesday 30 June 2020 9:12:09 PM IST Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> While loading dquot records off disk, make sure that the quota type
> flags are the same between the incore dquot and the ondisk dquot.
>
The changes look good to me.
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> fs/xfs/xfs_dquot.c | 23 ++++++++++++++++++++---
> 1 file changed, 20 insertions(+), 3 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
> index d5b7f03e93c8..46c8ca83c04d 100644
> --- a/fs/xfs/xfs_dquot.c
> +++ b/fs/xfs/xfs_dquot.c
> @@ -524,13 +524,27 @@ xfs_dquot_alloc(
> }
>
> /* Copy the in-core quota fields in from the on-disk buffer. */
> -STATIC void
> +STATIC int
> xfs_dquot_from_disk(
> struct xfs_dquot *dqp,
> struct xfs_buf *bp)
> {
> struct xfs_disk_dquot *ddqp = bp->b_addr + dqp->q_bufoffset;
>
> + /*
> + * The only field the verifier didn't check was the quota type flag, so
> + * do that here.
> + */
> + if ((dqp->dq_flags & XFS_DQ_ALLTYPES) !=
> + (ddqp->d_flags & XFS_DQ_ALLTYPES) ||
> + dqp->q_core.d_id != ddqp->d_id) {
> + xfs_alert(bp->b_mount,
> + "Metadata corruption detected at %pS, quota %u",
> + __this_address, be32_to_cpu(dqp->q_core.d_id));
> + xfs_alert(bp->b_mount, "Unmount and run xfs_repair");
> + return -EFSCORRUPTED;
> + }
> +
> /* copy everything from disk dquot to the incore dquot */
> memcpy(&dqp->q_core, ddqp, sizeof(struct xfs_disk_dquot));
>
> @@ -544,6 +558,7 @@ xfs_dquot_from_disk(
>
> /* initialize the dquot speculative prealloc thresholds */
> xfs_dquot_set_prealloc_limits(dqp);
> + return 0;
> }
>
> /* Allocate and initialize the dquot buffer for this in-core dquot. */
> @@ -617,9 +632,11 @@ xfs_qm_dqread(
> * further.
> */
> ASSERT(xfs_buf_islocked(bp));
> - xfs_dquot_from_disk(dqp, bp);
> -
> + error = xfs_dquot_from_disk(dqp, bp);
> xfs_buf_relse(bp);
> + if (error)
> + goto err;
> +
> *dqpp = dqp;
> return error;
>
>
>
--
chandan
next prev parent reply other threads:[~2020-07-01 8:34 UTC|newest]
Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-30 15:41 [PATCH 00/18] xfs: remove xfs_disk_quot from incore dquot Darrick J. Wong
2020-06-30 15:41 ` [PATCH 01/18] xfs: clear XFS_DQ_FREEING if we can't lock the dquot buffer to flush Darrick J. Wong
2020-06-30 21:35 ` Allison Collins
2020-07-01 8:32 ` Chandan Babu R
2020-07-01 8:33 ` Christoph Hellwig
2020-07-01 22:42 ` Dave Chinner
2020-06-30 15:42 ` [PATCH 02/18] xfs: fix inode quota reservation checks Darrick J. Wong
2020-06-30 21:35 ` Allison Collins
2020-07-01 8:33 ` Chandan Babu R
2020-07-01 8:34 ` Christoph Hellwig
2020-06-30 15:42 ` [PATCH 03/18] xfs: validate ondisk/incore dquot flags Darrick J. Wong
2020-06-30 21:35 ` Allison Collins
2020-07-01 8:33 ` Chandan Babu R [this message]
2020-07-01 8:42 ` Christoph Hellwig
2020-07-01 18:25 ` Darrick J. Wong
2020-07-02 6:30 ` Christoph Hellwig
2020-07-02 15:13 ` Darrick J. Wong
2020-07-01 22:41 ` Dave Chinner
2020-07-01 23:16 ` Darrick J. Wong
2020-06-30 15:42 ` [PATCH 04/18] xfs: stop using q_core.d_flags in the quota code Darrick J. Wong
2020-07-01 8:34 ` Chandan Babu R
2020-07-01 8:47 ` Christoph Hellwig
2020-07-01 19:02 ` Darrick J. Wong
2020-07-01 20:15 ` Allison Collins
2020-07-01 22:50 ` Dave Chinner
2020-07-01 23:19 ` Darrick J. Wong
2020-07-01 23:44 ` Dave Chinner
2020-07-01 23:50 ` Darrick J. Wong
2020-07-03 0:58 ` Dave Chinner
2020-07-03 18:01 ` Darrick J. Wong
2020-06-30 15:42 ` [PATCH 05/18] xfs: stop using q_core.d_id " Darrick J. Wong
2020-07-01 8:33 ` Chandan Babu R
2020-07-01 8:48 ` Christoph Hellwig
2020-07-01 20:16 ` Allison Collins
2020-06-30 15:42 ` [PATCH 06/18] xfs: use a per-resource struct for incore dquot data Darrick J. Wong
2020-07-01 8:33 ` Chandan Babu R
2020-07-01 8:49 ` Christoph Hellwig
2020-07-01 20:16 ` Allison Collins
2020-06-30 15:42 ` [PATCH 07/18] xfs: stop using q_core limits in the quota code Darrick J. Wong
2020-07-01 8:33 ` Chandan Babu R
2020-07-01 8:50 ` Christoph Hellwig
2020-07-01 20:16 ` Allison Collins
2020-07-01 23:01 ` Dave Chinner
2020-07-01 23:13 ` Darrick J. Wong
2020-07-01 23:33 ` Darrick J. Wong
2020-07-01 23:45 ` Dave Chinner
2020-06-30 15:42 ` [PATCH 08/18] xfs: stop using q_core counters " Darrick J. Wong
2020-07-01 8:33 ` Chandan Babu R
2020-07-01 8:51 ` Christoph Hellwig
2020-07-01 23:20 ` Allison Collins
2020-06-30 15:42 ` [PATCH 09/18] xfs: stop using q_core warning " Darrick J. Wong
2020-07-01 8:33 ` Chandan Babu R
2020-07-01 8:51 ` Christoph Hellwig
2020-07-01 23:20 ` Allison Collins
2020-06-30 15:42 ` [PATCH 10/18] xfs: stop using q_core timers " Darrick J. Wong
2020-07-01 8:34 ` Chandan Babu R
2020-07-01 8:51 ` Christoph Hellwig
2020-07-01 23:20 ` Allison Collins
2020-06-30 15:43 ` [PATCH 11/18] xfs: remove qcore from incore dquots Darrick J. Wong
2020-07-01 8:34 ` Chandan Babu R
2020-07-01 8:52 ` Christoph Hellwig
2020-07-01 23:07 ` Dave Chinner
2020-07-01 23:14 ` Darrick J. Wong
2020-07-02 2:06 ` Allison Collins
2020-06-30 15:43 ` [PATCH 12/18] xfs: refactor default quota limits by resource Darrick J. Wong
2020-07-01 8:52 ` Chandan Babu R
2020-07-01 8:53 ` Christoph Hellwig
2020-07-01 23:30 ` Dave Chinner
2020-07-02 0:07 ` Darrick J. Wong
2020-07-02 2:06 ` Allison Collins
2020-06-30 15:43 ` [PATCH 13/18] xfs: remove unnecessary arguments from quota adjust functions Darrick J. Wong
2020-07-01 8:53 ` Christoph Hellwig
2020-07-01 8:58 ` Chandan Babu R
2020-07-02 2:06 ` Allison Collins
2020-06-30 15:43 ` [PATCH 14/18] xfs: refactor quota exceeded test Darrick J. Wong
2020-07-01 8:56 ` Christoph Hellwig
2020-07-01 17:51 ` Darrick J. Wong
2020-07-01 18:48 ` Eric Sandeen
2020-07-01 23:34 ` Dave Chinner
2020-07-01 10:19 ` Chandan Babu R
2020-07-02 18:57 ` Allison Collins
2020-06-30 15:43 ` [PATCH 15/18] xfs: refactor xfs_qm_scall_setqlim Darrick J. Wong
2020-07-01 8:56 ` Christoph Hellwig
2020-07-03 4:11 ` Allison Collins
2020-07-03 12:39 ` Chandan Babu R
2020-06-30 15:43 ` [PATCH 16/18] xfs: refactor xfs_trans_dqresv Darrick J. Wong
2020-07-03 4:11 ` Allison Collins
2020-07-03 13:00 ` Chandan Babu R
2020-06-30 15:43 ` [PATCH 17/18] xfs: refactor xfs_trans_apply_dquot_deltas Darrick J. Wong
2020-07-04 20:41 ` Allison Collins
2020-07-06 13:40 ` Chandan Babu R
2020-06-30 15:43 ` [PATCH 18/18] xfs: add more dquot tracepoints Darrick J. Wong
2020-07-04 20:41 ` Allison Collins
2020-07-06 13:42 ` 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=2301729.XddXFWAJP6@garuda \
--to=chandanrlinux@gmail.com \
--cc=darrick.wong@oracle.com \
--cc=linux-xfs@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).