Re: [PATCH 2/3] xfs: remove the xfs_dsb_t typedef

["Darrick J. Wong" <djwong@kernel.org>]

On Thu, Aug 12, 2021 at 10:43:42AM +0200, Christoph Hellwig wrote:
> Remove the few leftover instances of the xfs_dinode_t typedef.

With the commit message fixed,
Reviewed-by: Darrick J. Wong <djwong@kernel.org>

--D

> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  fs/xfs/libxfs/xfs_format.h | 5 ++---
>  fs/xfs/libxfs/xfs_sb.c     | 4 ++--
>  fs/xfs/xfs_trans.c         | 8 ++++----
>  3 files changed, 8 insertions(+), 9 deletions(-)
> 
> diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
> index f601049b65f465..5819c25c1478d0 100644
> --- a/fs/xfs/libxfs/xfs_format.h
> +++ b/fs/xfs/libxfs/xfs_format.h
> @@ -184,7 +184,7 @@ typedef struct xfs_sb {
>   * Superblock - on disk version.  Must match the in core version above.
>   * Must be padded to 64 bit alignment.
>   */
> -typedef struct xfs_dsb {
> +struct xfs_dsb {
>  	__be32		sb_magicnum;	/* magic number == XFS_SB_MAGIC */
>  	__be32		sb_blocksize;	/* logical block size, bytes */
>  	__be64		sb_dblocks;	/* number of data blocks */
> @@ -263,8 +263,7 @@ typedef struct xfs_dsb {
>  	uuid_t		sb_meta_uuid;	/* metadata file system unique id */
>  
>  	/* must be padded to 64 bit alignment */
> -} xfs_dsb_t;
> -
> +};
>  
>  /*
>   * Misc. Flags - warning - these will be cleared by xfs_repair unless
> diff --git a/fs/xfs/libxfs/xfs_sb.c b/fs/xfs/libxfs/xfs_sb.c
> index 04f5386446dbb0..56d241cb17ee1b 100644
> --- a/fs/xfs/libxfs/xfs_sb.c
> +++ b/fs/xfs/libxfs/xfs_sb.c
> @@ -391,7 +391,7 @@ xfs_sb_quota_from_disk(struct xfs_sb *sbp)
>  static void
>  __xfs_sb_from_disk(
>  	struct xfs_sb	*to,
> -	xfs_dsb_t	*from,
> +	struct xfs_dsb	*from,
>  	bool		convert_xquota)
>  {
>  	to->sb_magicnum = be32_to_cpu(from->sb_magicnum);
> @@ -466,7 +466,7 @@ __xfs_sb_from_disk(
>  void
>  xfs_sb_from_disk(
>  	struct xfs_sb	*to,
> -	xfs_dsb_t	*from)
> +	struct xfs_dsb	*from)
>  {
>  	__xfs_sb_from_disk(to, from, true);
>  }
> diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
> index 83abaa21961605..7f4f431bc256ce 100644
> --- a/fs/xfs/xfs_trans.c
> +++ b/fs/xfs/xfs_trans.c
> @@ -477,7 +477,7 @@ STATIC void
>  xfs_trans_apply_sb_deltas(
>  	xfs_trans_t	*tp)
>  {
> -	xfs_dsb_t	*sbp;
> +	struct xfs_dsb	*sbp;
>  	struct xfs_buf	*bp;
>  	int		whole = 0;
>  
> @@ -541,14 +541,14 @@ xfs_trans_apply_sb_deltas(
>  		/*
>  		 * Log the whole thing, the fields are noncontiguous.
>  		 */
> -		xfs_trans_log_buf(tp, bp, 0, sizeof(xfs_dsb_t) - 1);
> +		xfs_trans_log_buf(tp, bp, 0, sizeof(struct xfs_dsb) - 1);
>  	else
>  		/*
>  		 * Since all the modifiable fields are contiguous, we
>  		 * can get away with this.
>  		 */
> -		xfs_trans_log_buf(tp, bp, offsetof(xfs_dsb_t, sb_icount),
> -				  offsetof(xfs_dsb_t, sb_frextents) +
> +		xfs_trans_log_buf(tp, bp, offsetof(struct xfs_dsb, sb_icount),
> +				  offsetof(struct xfs_dsb, sb_frextents) +
>  				  sizeof(sbp->sb_frextents) - 1);
>  }
>  
> -- 
> 2.30.2
>