On Thu, Aug 12, 2021 at 10:43:41AM +0200, Christoph Hellwig wrote:
> Remove the few leftover instances of the xfs_dinode_t typedef.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
--D
> ---
> fs/xfs/libxfs/xfs_format.h | 4 ++--
> fs/xfs/libxfs/xfs_inode_buf.c | 6 +++---
> fs/xfs/libxfs/xfs_inode_fork.c | 16 ++++++++--------
> fs/xfs/xfs_buf_item_recover.c | 2 +-
> 4 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
> index 5d8a129150d547..f601049b65f465 100644
> --- a/fs/xfs/libxfs/xfs_format.h
> +++ b/fs/xfs/libxfs/xfs_format.h
> @@ -977,7 +977,7 @@ static inline time64_t xfs_bigtime_to_unix(uint64_t ondisk_seconds)
> * padding field for v3 inodes.
> */
> #define XFS_DINODE_MAGIC 0x494e /* 'IN' */
> -typedef struct xfs_dinode {
> +struct xfs_dinode {
> __be16 di_magic; /* inode magic # = XFS_DINODE_MAGIC */
> __be16 di_mode; /* mode and type of file */
> __u8 di_version; /* inode version */
> @@ -1022,7 +1022,7 @@ typedef struct xfs_dinode {
> uuid_t di_uuid; /* UUID of the filesystem */
>
> /* structure must be padded to 64 bit alignment */
> -} xfs_dinode_t;
> +};
>
> #define XFS_DINODE_CRC_OFF offsetof(struct xfs_dinode, di_crc)
>
> diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
> index 84ea2e0af9f026..891940cc16f905 100644
> --- a/fs/xfs/libxfs/xfs_inode_buf.c
> +++ b/fs/xfs/libxfs/xfs_inode_buf.c
> @@ -51,9 +51,9 @@ xfs_inode_buf_verify(
> agno = xfs_daddr_to_agno(mp, XFS_BUF_ADDR(bp));
> ni = XFS_BB_TO_FSB(mp, bp->b_length) * mp->m_sb.sb_inopblock;
> for (i = 0; i < ni; i++) {
> - int di_ok;
> - xfs_dinode_t *dip;
> - xfs_agino_t unlinked_ino;
> + struct xfs_dinode *dip;
> + xfs_agino_t unlinked_ino;
> + int di_ok;
>
> dip = xfs_buf_offset(bp, (i << mp->m_sb.sb_inodelog));
> unlinked_ino = be32_to_cpu(dip->di_next_unlinked);
> diff --git a/fs/xfs/libxfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c
> index 1d174909f9bdf5..08a390a259491c 100644
> --- a/fs/xfs/libxfs/xfs_inode_fork.c
> +++ b/fs/xfs/libxfs/xfs_inode_fork.c
> @@ -67,10 +67,10 @@ xfs_init_local_fork(
> */
> STATIC int
> xfs_iformat_local(
> - xfs_inode_t *ip,
> - xfs_dinode_t *dip,
> - int whichfork,
> - int size)
> + struct xfs_inode *ip,
> + struct xfs_dinode *dip,
> + int whichfork,
> + int size)
> {
> /*
> * If the size is unreasonable, then something
> @@ -162,8 +162,8 @@ xfs_iformat_extents(
> */
> STATIC int
> xfs_iformat_btree(
> - xfs_inode_t *ip,
> - xfs_dinode_t *dip,
> + struct xfs_inode *ip,
> + struct xfs_dinode *dip,
> int whichfork)
> {
> struct xfs_mount *mp = ip->i_mount;
> @@ -580,8 +580,8 @@ xfs_iextents_copy(
> */
> void
> xfs_iflush_fork(
> - xfs_inode_t *ip,
> - xfs_dinode_t *dip,
> + struct xfs_inode *ip,
> + struct xfs_dinode *dip,
> struct xfs_inode_log_item *iip,
> int whichfork)
> {
> diff --git a/fs/xfs/xfs_buf_item_recover.c b/fs/xfs/xfs_buf_item_recover.c
> index 4775485b406233..55ee89a88f5549 100644
> --- a/fs/xfs/xfs_buf_item_recover.c
> +++ b/fs/xfs/xfs_buf_item_recover.c
> @@ -603,7 +603,7 @@ xlog_recover_do_inode_buffer(
> inodes_per_buf = BBTOB(bp->b_length) >> mp->m_sb.sb_inodelog;
> for (i = 0; i < inodes_per_buf; i++) {
> next_unlinked_offset = (i * mp->m_sb.sb_inodesize) +
> - offsetof(xfs_dinode_t, di_next_unlinked);
> + offsetof(struct xfs_dinode, di_next_unlinked);
>
> while (next_unlinked_offset >=
> (reg_buf_offset + reg_buf_bytes)) {
> --
> 2.30.2
>
