On Wednesday 15 July 2020 7:21:20 AM IST Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
>
> Rename the existing incore dquot "dq_flags" field to "q_flags" to match
> everything else in the structure, then move the two actual dquot state
> flags to the XFS_DQFLAG_ namespace from XFS_DQ_.
>
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/libxfs/xfs_quota_defs.h | 10 +++++-----
> fs/xfs/xfs_dquot.c | 6 +++---
> fs/xfs/xfs_dquot.h | 4 ++--
> fs/xfs/xfs_qm.c | 12 ++++++------
> fs/xfs/xfs_qm_syscalls.c | 2 +-
> fs/xfs/xfs_trace.h | 4 ++--
> fs/xfs/xfs_trans_dquot.c | 2 +-
> 7 files changed, 20 insertions(+), 20 deletions(-)
>
>
> diff --git a/fs/xfs/libxfs/xfs_quota_defs.h b/fs/xfs/libxfs/xfs_quota_defs.h
> index aaf85a47ae5f..2109fe621e1f 100644
> --- a/fs/xfs/libxfs/xfs_quota_defs.h
> +++ b/fs/xfs/libxfs/xfs_quota_defs.h
> @@ -37,17 +37,17 @@ typedef uint8_t xfs_dqtype_t;
> #define XFS_DQ_USER 0x0001 /* a user quota */
> #define XFS_DQ_PROJ 0x0002 /* project quota */
> #define XFS_DQ_GROUP 0x0004 /* a group quota */
> -#define XFS_DQ_DIRTY 0x0008 /* dquot is dirty */
> -#define XFS_DQ_FREEING 0x0010 /* dquot is being torn down */
> +#define XFS_DQFLAG_DIRTY 0x0008 /* dquot is dirty */
> +#define XFS_DQFLAG_FREEING 0x0010 /* dquot is being torn down */
>
> #define XFS_DQ_ALLTYPES (XFS_DQ_USER|XFS_DQ_PROJ|XFS_DQ_GROUP)
>
> -#define XFS_DQ_FLAGS \
> +#define XFS_DQFLAG_STRINGS \
> { XFS_DQ_USER, "USER" }, \
> { XFS_DQ_PROJ, "PROJ" }, \
> { XFS_DQ_GROUP, "GROUP" }, \
> - { XFS_DQ_DIRTY, "DIRTY" }, \
> - { XFS_DQ_FREEING, "FREEING" }
> + { XFS_DQFLAG_DIRTY, "DIRTY" }, \
> + { XFS_DQFLAG_FREEING, "FREEING" }
>
> /*
> * We have the possibility of all three quota types being active at once, and
> diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
> index 8230faa9f66e..91d81a346801 100644
> --- a/fs/xfs/xfs_dquot.c
> +++ b/fs/xfs/xfs_dquot.c
> @@ -730,7 +730,7 @@ xfs_qm_dqget_cache_lookup(
> }
>
> xfs_dqlock(dqp);
> - if (dqp->dq_flags & XFS_DQ_FREEING) {
> + if (dqp->q_flags & XFS_DQFLAG_FREEING) {
> xfs_dqunlock(dqp);
> mutex_unlock(&qi->qi_tree_lock);
> trace_xfs_dqget_freeing(dqp);
> @@ -1186,7 +1186,7 @@ xfs_qm_dqflush(
> /*
> * Clear the dirty field and remember the flush lsn for later use.
> */
> - dqp->dq_flags &= ~XFS_DQ_DIRTY;
> + dqp->q_flags &= ~XFS_DQFLAG_DIRTY;
>
> xfs_trans_ail_copy_lsn(mp->m_ail, &dqp->q_logitem.qli_flush_lsn,
> &dqp->q_logitem.qli_item.li_lsn);
> @@ -1227,7 +1227,7 @@ xfs_qm_dqflush(
> return 0;
>
> out_abort:
> - dqp->dq_flags &= ~XFS_DQ_DIRTY;
> + dqp->q_flags &= ~XFS_DQFLAG_DIRTY;
> xfs_trans_ail_delete(lip, 0);
> xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
> out_unlock:
> diff --git a/fs/xfs/xfs_dquot.h b/fs/xfs/xfs_dquot.h
> index 077d0988cff9..7f3f734bced8 100644
> --- a/fs/xfs/xfs_dquot.h
> +++ b/fs/xfs/xfs_dquot.h
> @@ -31,10 +31,10 @@ enum {
> * The incore dquot structure
> */
> struct xfs_dquot {
> - uint dq_flags;
> struct list_head q_lru;
> struct xfs_mount *q_mount;
> xfs_dqtype_t q_type;
> + uint16_t q_flags;
> uint q_nrefs;
> xfs_daddr_t q_blkno;
> int q_bufoffset;
> @@ -152,7 +152,7 @@ static inline bool xfs_dquot_lowsp(struct xfs_dquot *dqp)
> }
>
> #define XFS_DQ_IS_LOCKED(dqp) (mutex_is_locked(&((dqp)->q_qlock)))
> -#define XFS_DQ_IS_DIRTY(dqp) ((dqp)->dq_flags & XFS_DQ_DIRTY)
> +#define XFS_DQ_IS_DIRTY(dqp) ((dqp)->q_flags & XFS_DQFLAG_DIRTY)
> #define XFS_QM_ISUDQ(dqp) ((dqp)->q_type == XFS_DQTYPE_USER)
> #define XFS_QM_ISPDQ(dqp) ((dqp)->q_type == XFS_DQTYPE_PROJ)
> #define XFS_QM_ISGDQ(dqp) ((dqp)->q_type == XFS_DQTYPE_GROUP)
> diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
> index 939ee728d9af..aabb08e85cd7 100644
> --- a/fs/xfs/xfs_qm.c
> +++ b/fs/xfs/xfs_qm.c
> @@ -124,10 +124,10 @@ xfs_qm_dqpurge(
> int error = -EAGAIN;
>
> xfs_dqlock(dqp);
> - if ((dqp->dq_flags & XFS_DQ_FREEING) || dqp->q_nrefs != 0)
> + if ((dqp->q_flags & XFS_DQFLAG_FREEING) || dqp->q_nrefs != 0)
> goto out_unlock;
>
> - dqp->dq_flags |= XFS_DQ_FREEING;
> + dqp->q_flags |= XFS_DQFLAG_FREEING;
>
> xfs_dqflock(dqp);
>
> @@ -148,7 +148,7 @@ xfs_qm_dqpurge(
> error = xfs_bwrite(bp);
> xfs_buf_relse(bp);
> } else if (error == -EAGAIN) {
> - dqp->dq_flags &= ~XFS_DQ_FREEING;
> + dqp->q_flags &= ~XFS_DQFLAG_FREEING;
> goto out_unlock;
> }
> xfs_dqflock(dqp);
> @@ -474,7 +474,7 @@ xfs_qm_dquot_isolate(
> /*
> * Prevent lookups now that we are past the point of no return.
> */
> - dqp->dq_flags |= XFS_DQ_FREEING;
> + dqp->q_flags |= XFS_DQFLAG_FREEING;
> xfs_dqunlock(dqp);
>
> ASSERT(dqp->q_nrefs == 0);
> @@ -1113,7 +1113,7 @@ xfs_qm_quotacheck_dqadjust(
> xfs_qm_adjust_dqtimers(mp, dqp);
> }
>
> - dqp->dq_flags |= XFS_DQ_DIRTY;
> + dqp->q_flags |= XFS_DQFLAG_DIRTY;
> xfs_qm_dqput(dqp);
> return 0;
> }
> @@ -1219,7 +1219,7 @@ xfs_qm_flush_one(
> int error = 0;
>
> xfs_dqlock(dqp);
> - if (dqp->dq_flags & XFS_DQ_FREEING)
> + if (dqp->q_flags & XFS_DQFLAG_FREEING)
> goto out_unlock;
> if (!XFS_DQ_IS_DIRTY(dqp))
> goto out_unlock;
> diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
> index c7cb8a356c88..7f157275e370 100644
> --- a/fs/xfs/xfs_qm_syscalls.c
> +++ b/fs/xfs/xfs_qm_syscalls.c
> @@ -598,7 +598,7 @@ xfs_qm_scall_setqlim(
> */
> xfs_qm_adjust_dqtimers(mp, dqp);
> }
> - dqp->dq_flags |= XFS_DQ_DIRTY;
> + dqp->q_flags |= XFS_DQFLAG_DIRTY;
> xfs_trans_log_dquot(tp, dqp);
>
> error = xfs_trans_commit(tp);
> diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
> index f19e66da6646..0b6738070619 100644
> --- a/fs/xfs/xfs_trace.h
> +++ b/fs/xfs/xfs_trace.h
> @@ -879,7 +879,7 @@ DECLARE_EVENT_CLASS(xfs_dquot_class,
> __entry->dev = dqp->q_mount->m_super->s_dev;
> __entry->id = be32_to_cpu(dqp->q_core.d_id);
> __entry->type = dqp->q_type;
> - __entry->flags = dqp->dq_flags;
> + __entry->flags = dqp->q_flags;
> __entry->nrefs = dqp->q_nrefs;
> __entry->res_bcount = dqp->q_res_bcount;
> __entry->bcount = be64_to_cpu(dqp->q_core.d_bcount);
> @@ -899,7 +899,7 @@ DECLARE_EVENT_CLASS(xfs_dquot_class,
> MAJOR(__entry->dev), MINOR(__entry->dev),
> __entry->id,
> __print_symbolic(__entry->type, XFS_DQTYPE_STRINGS),
> - __print_flags(__entry->flags, "|", XFS_DQ_FLAGS),
> + __print_flags(__entry->flags, "|", XFS_DQFLAG_STRINGS),
> __entry->nrefs,
> __entry->res_bcount,
> __entry->bcount,
> diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
> index 964f69a444a3..bdbd8e88c772 100644
> --- a/fs/xfs/xfs_trans_dquot.c
> +++ b/fs/xfs/xfs_trans_dquot.c
> @@ -391,7 +391,7 @@ xfs_trans_apply_dquot_deltas(
> xfs_qm_adjust_dqtimers(tp->t_mountp, dqp);
> }
>
> - dqp->dq_flags |= XFS_DQ_DIRTY;
> + dqp->q_flags |= XFS_DQFLAG_DIRTY;
> /*
> * add this to the list of items to get logged
> */
>
>
--
chandan
