Re: [PATCH 3/3] xfs: remove the xfs_dqblk_t typedef

[Alex Elder <elder@ieee.org>]

On 8/12/21 3:43 AM, Christoph Hellwig wrote:
> Remove the few leftover instances of the xfs_dinode_t typedef.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Fix the description:  s/xfs_dinode_t/xfs_dqblk_t/

> ---
>  fs/xfs/libxfs/xfs_dquot_buf.c | 4 ++--
>  fs/xfs/libxfs/xfs_format.h    | 4 ++--
>  fs/xfs/xfs_dquot.c            | 2 +-
>  fs/xfs/xfs_qm.c               | 2 +-
>  4 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/fs/xfs/libxfs/xfs_dquot_buf.c b/fs/xfs/libxfs/xfs_dquot_buf.c
> index 6766417d5ba448..7691e44d38b9ac 100644
> --- a/fs/xfs/libxfs/xfs_dquot_buf.c
> +++ b/fs/xfs/libxfs/xfs_dquot_buf.c
> @@ -22,7 +22,7 @@ xfs_calc_dquots_per_chunk(
>  	unsigned int		nbblks)	/* basic block units */
>  {
>  	ASSERT(nbblks > 0);
> -	return BBTOB(nbblks) / sizeof(xfs_dqblk_t);
> +	return BBTOB(nbblks) / sizeof(struct xfs_dqblk);
>  }
>  
>  /*
> @@ -127,7 +127,7 @@ xfs_dqblk_repair(
>  	 * Typically, a repair is only requested by quotacheck.
>  	 */
>  	ASSERT(id != -1);
> -	memset(dqb, 0, sizeof(xfs_dqblk_t));
> +	memset(dqb, 0, sizeof(struct xfs_dqblk));
>  
>  	dqb->dd_diskdq.d_magic = cpu_to_be16(XFS_DQUOT_MAGIC);
>  	dqb->dd_diskdq.d_version = XFS_DQUOT_VERSION;
> diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
> index 5819c25c1478d0..61e454e4381e42 100644
> --- a/fs/xfs/libxfs/xfs_format.h
> +++ b/fs/xfs/libxfs/xfs_format.h
> @@ -1411,7 +1411,7 @@ struct xfs_disk_dquot {
>   * This is what goes on disk. This is separated from the xfs_disk_dquot because
>   * carrying the unnecessary padding would be a waste of memory.
>   */
> -typedef struct xfs_dqblk {
> +struct xfs_dqblk {
>  	struct xfs_disk_dquot	dd_diskdq; /* portion living incore as well */
>  	char			dd_fill[4];/* filling for posterity */
>  
> @@ -1421,7 +1421,7 @@ typedef struct xfs_dqblk {
>  	__be32		  dd_crc;	/* checksum */
>  	__be64		  dd_lsn;	/* last modification in log */
>  	uuid_t		  dd_uuid;	/* location information */
> -} xfs_dqblk_t;
> +};
>  
>  #define XFS_DQUOT_CRC_OFF	offsetof(struct xfs_dqblk, dd_crc)
>  
> diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
> index c301b18b7685b1..a86665bdd4afb5 100644
> --- a/fs/xfs/xfs_dquot.c
> +++ b/fs/xfs/xfs_dquot.c
> @@ -471,7 +471,7 @@ xfs_dquot_alloc(
>  	 * Offset of dquot in the (fixed sized) dquot chunk.
>  	 */
>  	dqp->q_bufoffset = (id % mp->m_quotainfo->qi_dqperchunk) *
> -			sizeof(xfs_dqblk_t);
> +			sizeof(struct xfs_dqblk);
>  
>  	/*
>  	 * Because we want to use a counting completion, complete
> diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
> index 2bef4735d03031..95fdbe1b7016da 100644
> --- a/fs/xfs/xfs_qm.c
> +++ b/fs/xfs/xfs_qm.c
> @@ -850,7 +850,7 @@ xfs_qm_reset_dqcounts(
>  	 */
>  #ifdef DEBUG
>  	j = (int)XFS_FSB_TO_B(mp, XFS_DQUOT_CLUSTER_SIZE_FSB) /
> -		sizeof(xfs_dqblk_t);
> +		sizeof(struct xfs_dqblk);
>  	ASSERT(mp->m_quotainfo->qi_dqperchunk == j);
>  #endif
>  	dqb = bp->b_addr;
>