Commit de38db72 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong

xfs: remove the xfs_dinode_t typedef

Remove the few leftover instances of the xfs_dinode_t typedef.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 4c175af2
...@@ -780,7 +780,7 @@ static inline time64_t xfs_bigtime_to_unix(uint64_t ondisk_seconds) ...@@ -780,7 +780,7 @@ static inline time64_t xfs_bigtime_to_unix(uint64_t ondisk_seconds)
* padding field for v3 inodes. * padding field for v3 inodes.
*/ */
#define XFS_DINODE_MAGIC 0x494e /* 'IN' */ #define XFS_DINODE_MAGIC 0x494e /* 'IN' */
typedef struct xfs_dinode { struct xfs_dinode {
__be16 di_magic; /* inode magic # = XFS_DINODE_MAGIC */ __be16 di_magic; /* inode magic # = XFS_DINODE_MAGIC */
__be16 di_mode; /* mode and type of file */ __be16 di_mode; /* mode and type of file */
__u8 di_version; /* inode version */ __u8 di_version; /* inode version */
...@@ -825,7 +825,7 @@ typedef struct xfs_dinode { ...@@ -825,7 +825,7 @@ typedef struct xfs_dinode {
uuid_t di_uuid; /* UUID of the filesystem */ uuid_t di_uuid; /* UUID of the filesystem */
/* structure must be padded to 64 bit alignment */ /* structure must be padded to 64 bit alignment */
} xfs_dinode_t; };
#define XFS_DINODE_CRC_OFF offsetof(struct xfs_dinode, di_crc) #define XFS_DINODE_CRC_OFF offsetof(struct xfs_dinode, di_crc)
......
...@@ -51,9 +51,9 @@ xfs_inode_buf_verify( ...@@ -51,9 +51,9 @@ xfs_inode_buf_verify(
agno = xfs_daddr_to_agno(mp, xfs_buf_daddr(bp)); agno = xfs_daddr_to_agno(mp, xfs_buf_daddr(bp));
ni = XFS_BB_TO_FSB(mp, bp->b_length) * mp->m_sb.sb_inopblock; ni = XFS_BB_TO_FSB(mp, bp->b_length) * mp->m_sb.sb_inopblock;
for (i = 0; i < ni; i++) { for (i = 0; i < ni; i++) {
int di_ok; struct xfs_dinode *dip;
xfs_dinode_t *dip; xfs_agino_t unlinked_ino;
xfs_agino_t unlinked_ino; int di_ok;
dip = xfs_buf_offset(bp, (i << mp->m_sb.sb_inodelog)); dip = xfs_buf_offset(bp, (i << mp->m_sb.sb_inodelog));
unlinked_ino = be32_to_cpu(dip->di_next_unlinked); unlinked_ino = be32_to_cpu(dip->di_next_unlinked);
......
...@@ -67,10 +67,10 @@ xfs_init_local_fork( ...@@ -67,10 +67,10 @@ xfs_init_local_fork(
*/ */
STATIC int STATIC int
xfs_iformat_local( xfs_iformat_local(
xfs_inode_t *ip, struct xfs_inode *ip,
xfs_dinode_t *dip, struct xfs_dinode *dip,
int whichfork, int whichfork,
int size) int size)
{ {
/* /*
* If the size is unreasonable, then something * If the size is unreasonable, then something
...@@ -162,8 +162,8 @@ xfs_iformat_extents( ...@@ -162,8 +162,8 @@ xfs_iformat_extents(
*/ */
STATIC int STATIC int
xfs_iformat_btree( xfs_iformat_btree(
xfs_inode_t *ip, struct xfs_inode *ip,
xfs_dinode_t *dip, struct xfs_dinode *dip,
int whichfork) int whichfork)
{ {
struct xfs_mount *mp = ip->i_mount; struct xfs_mount *mp = ip->i_mount;
...@@ -580,8 +580,8 @@ xfs_iextents_copy( ...@@ -580,8 +580,8 @@ xfs_iextents_copy(
*/ */
void void
xfs_iflush_fork( xfs_iflush_fork(
xfs_inode_t *ip, struct xfs_inode *ip,
xfs_dinode_t *dip, struct xfs_dinode *dip,
struct xfs_inode_log_item *iip, struct xfs_inode_log_item *iip,
int whichfork) int whichfork)
{ {
......
...@@ -603,7 +603,7 @@ xlog_recover_do_inode_buffer( ...@@ -603,7 +603,7 @@ xlog_recover_do_inode_buffer(
inodes_per_buf = BBTOB(bp->b_length) >> mp->m_sb.sb_inodelog; inodes_per_buf = BBTOB(bp->b_length) >> mp->m_sb.sb_inodelog;
for (i = 0; i < inodes_per_buf; i++) { for (i = 0; i < inodes_per_buf; i++) {
next_unlinked_offset = (i * mp->m_sb.sb_inodesize) + 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 >= while (next_unlinked_offset >=
(reg_buf_offset + reg_buf_bytes)) { (reg_buf_offset + reg_buf_bytes)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment