On Wednesday 15 July 2020 7:21:40 AM IST Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
>
> Use the incore dq_flags to figure out the dquot type. This is the first
> step towards removing xfs_disk_dquot from the incore dquot.
>
The changes look good to me.
Reviewed-by: Chandan Babu R <chandanrlinux@xxxxxxxxx>
> Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> Reviewed-by: Christoph Hellwig <hch@xxxxxx>
> ---
> fs/xfs/xfs_dquot.c | 34 ++++++++++++++++++++++++++++++++--
> fs/xfs/xfs_dquot.h | 2 ++
> fs/xfs/xfs_dquot_item.c | 6 ++++--
> 3 files changed, 38 insertions(+), 4 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
> index 6fcea0d3989e..93b5b7277cb8 100644
> --- a/fs/xfs/xfs_dquot.c
> +++ b/fs/xfs/xfs_dquot.c
> @@ -568,6 +568,15 @@ xfs_dquot_from_disk(
> return 0;
> }
>
> +/* Copy the in-core quota fields into the on-disk buffer. */
> +void
> +xfs_dquot_to_disk(
> + struct xfs_disk_dquot *ddqp,
> + struct xfs_dquot *dqp)
> +{
> + memcpy(ddqp, &dqp->q_core, sizeof(struct xfs_disk_dquot));
> +}
> +
> /* Allocate and initialize the dquot buffer for this in-core dquot. */
> static int
> xfs_qm_dqread_alloc(
> @@ -1122,6 +1131,19 @@ xfs_dquot_done(
> }
> }
>
> +/* Check incore dquot for errors before we flush. */
> +static xfs_failaddr_t
> +xfs_qm_dqflush_check(
> + struct xfs_dquot *dqp)
> +{
> + if (dqp->q_type != XFS_DQTYPE_USER &&
> + dqp->q_type != XFS_DQTYPE_GROUP &&
> + dqp->q_type != XFS_DQTYPE_PROJ)
> + return __this_address;
> +
> + return NULL;
> +}
> +
> /*
> * Write a modified dquot to disk.
> * The dquot must be locked and the flush lock too taken by caller.
> @@ -1180,8 +1202,16 @@ xfs_qm_dqflush(
> goto out_abort;
> }
>
> - /* This is the only portion of data that needs to persist */
> - memcpy(ddqp, &dqp->q_core, sizeof(struct xfs_disk_dquot));
> + fa = xfs_qm_dqflush_check(dqp);
> + if (fa) {
> + xfs_alert(mp, "corrupt dquot ID 0x%x in memory at %pS",
> + be32_to_cpu(dqp->q_core.d_id), fa);
> + xfs_buf_relse(bp);
> + error = -EFSCORRUPTED;
> + goto out_abort;
> + }
> +
> + xfs_dquot_to_disk(ddqp, dqp);
>
> /*
> * Clear the dirty field and remember the flush lsn for later use.
> diff --git a/fs/xfs/xfs_dquot.h b/fs/xfs/xfs_dquot.h
> index 7f3f734bced8..84399d1d8188 100644
> --- a/fs/xfs/xfs_dquot.h
> +++ b/fs/xfs/xfs_dquot.h
> @@ -151,6 +151,8 @@ static inline bool xfs_dquot_lowsp(struct xfs_dquot *dqp)
> return false;
> }
>
> +void xfs_dquot_to_disk(struct xfs_disk_dquot *ddqp, struct xfs_dquot *dqp);
> +
> #define XFS_DQ_IS_LOCKED(dqp) (mutex_is_locked(&((dqp)->q_qlock)))
> #define XFS_DQ_IS_DIRTY(dqp) ((dqp)->q_flags & XFS_DQFLAG_DIRTY)
> #define XFS_QM_ISUDQ(dqp) ((dqp)->q_type == XFS_DQTYPE_USER)
> diff --git a/fs/xfs/xfs_dquot_item.c b/fs/xfs/xfs_dquot_item.c
> index d7e4de7151d7..fc21e48c889c 100644
> --- a/fs/xfs/xfs_dquot_item.c
> +++ b/fs/xfs/xfs_dquot_item.c
> @@ -45,6 +45,7 @@ xfs_qm_dquot_logitem_format(
> struct xfs_log_item *lip,
> struct xfs_log_vec *lv)
> {
> + struct xfs_disk_dquot ddq;
> struct xfs_dq_logitem *qlip = DQUOT_ITEM(lip);
> struct xfs_log_iovec *vecp = NULL;
> struct xfs_dq_logformat *qlf;
> @@ -58,8 +59,9 @@ xfs_qm_dquot_logitem_format(
> qlf->qlf_boffset = qlip->qli_dquot->q_bufoffset;
> xlog_finish_iovec(lv, vecp, sizeof(struct xfs_dq_logformat));
>
> - xlog_copy_iovec(lv, &vecp, XLOG_REG_TYPE_DQUOT,
> - &qlip->qli_dquot->q_core,
> + xfs_dquot_to_disk(&ddq, qlip->qli_dquot);
> +
> + xlog_copy_iovec(lv, &vecp, XLOG_REG_TYPE_DQUOT, &ddq,
> sizeof(struct xfs_disk_dquot));
> }
>
>
>
--
chandan
