Commit de38db72 authored Oct 11, 2021 by Christoph Hellwig Committed by Darrick J. Wong Oct 14, 2021

xfs: remove the xfs_dinode_t typedef



Remove the few leftover instances of the xfs_dinode_t typedef.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>

parent 4c175af2

fs/xfs/libxfs/xfs_format.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -780,7 +780,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 */
		@@ -825,7 +825,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)

fs/xfs/libxfs/xfs_inode_buf.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -51,9 +51,9 @@ xfs_inode_buf_verify(
		agno = xfs_daddr_to_agno(mp, xfs_buf_daddr(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;
		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);

fs/xfs/libxfs/xfs_inode_fork.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -67,8 +67,8 @@ xfs_init_local_fork(
		*/
		STATIC int
		xfs_iformat_local(
		xfs_inode_t *ip,
		xfs_dinode_t *dip,
		struct xfs_inode *ip,
		struct xfs_dinode *dip,
		int whichfork,
		int size)
		{
		@@ -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)
		{

fs/xfs/xfs_buf_item_recover.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)) {