From bc6a7d38013a6a2c98f20912d08f9519ae90598d Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Thu, 9 Jul 2020 20:19:58 +0200 Subject: [PATCH] xfs: remove the xfs_inode_log_item_t typedef Source kernel commit: fd9cbe51215198ccffa64169c98eae35b0916088 Signed-off-by: Christoph Hellwig Reviewed-by: Brian Foster Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong Signed-off-by: Christoph Hellwig --- include/xfs_trans.h | 4 ++-- libxfs/logitem.c | 2 +- libxfs/trans.c | 8 ++++---- libxfs/util.c | 2 +- libxfs/xfs_inode_fork.c | 2 +- libxfs/xfs_trans_inode.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/xfs_trans.h b/include/xfs_trans.h index 16e2a4682..0e7ddee92 100644 --- a/include/xfs_trans.h +++ b/include/xfs_trans.h @@ -26,14 +26,14 @@ typedef struct xfs_log_item { #define XFS_LI_DIRTY 3 /* log item dirty in transaction */ -typedef struct xfs_inode_log_item { +struct xfs_inode_log_item { xfs_log_item_t ili_item; /* common portion */ struct xfs_inode *ili_inode; /* inode pointer */ unsigned short ili_lock_flags; /* lock flags */ unsigned int ili_last_fields; /* fields when flushed*/ unsigned int ili_fields; /* fields to be logged */ unsigned int ili_fsync_fields; /* ignored by userspace */ -} xfs_inode_log_item_t; +}; typedef struct xfs_buf_log_item { xfs_log_item_t bli_item; /* common item structure */ diff --git a/libxfs/logitem.c b/libxfs/logitem.c index d0819dcbf..711d1c597 100644 --- a/libxfs/logitem.c +++ b/libxfs/logitem.c @@ -135,7 +135,7 @@ xfs_inode_item_init( xfs_inode_t *ip, xfs_mount_t *mp) { - xfs_inode_log_item_t *iip; + struct xfs_inode_log_item *iip; ASSERT(ip->i_itemp == NULL); iip = ip->i_itemp = kmem_zone_zalloc(xfs_ili_zone, 0); diff --git a/libxfs/trans.c b/libxfs/trans.c index ddd07cff5..9ae54fbed 100644 --- a/libxfs/trans.c +++ b/libxfs/trans.c @@ -793,7 +793,7 @@ xfs_inode_item_put( */ static void inode_item_done( - xfs_inode_log_item_t *iip) + struct xfs_inode_log_item *iip) { xfs_dinode_t *dip; xfs_inode_t *ip; @@ -874,7 +874,7 @@ trans_committed( if (lip->li_type == XFS_LI_BUF) buf_item_done((xfs_buf_log_item_t *)lip); else if (lip->li_type == XFS_LI_INODE) - inode_item_done((xfs_inode_log_item_t *)lip); + inode_item_done((struct xfs_inode_log_item *)lip); else { fprintf(stderr, _("%s: unrecognised log item type\n"), progname); @@ -902,7 +902,7 @@ buf_item_unlock( static void inode_item_unlock( - xfs_inode_log_item_t *iip) + struct xfs_inode_log_item *iip) { xfs_inode_item_put(iip); } @@ -919,7 +919,7 @@ xfs_trans_free_items( if (lip->li_type == XFS_LI_BUF) buf_item_unlock((xfs_buf_log_item_t *)lip); else if (lip->li_type == XFS_LI_INODE) - inode_item_unlock((xfs_inode_log_item_t *)lip); + inode_item_unlock((struct xfs_inode_log_item *)lip); else { fprintf(stderr, _("%s: unrecognised log item type\n"), progname); diff --git a/libxfs/util.c b/libxfs/util.c index 4bf060824..6224af3a8 100644 --- a/libxfs/util.c +++ b/libxfs/util.c @@ -352,7 +352,7 @@ libxfs_ialloc( int libxfs_iflush_int(xfs_inode_t *ip, xfs_buf_t *bp) { - xfs_inode_log_item_t *iip; + struct xfs_inode_log_item *iip; xfs_dinode_t *dip; xfs_mount_t *mp; diff --git a/libxfs/xfs_inode_fork.c b/libxfs/xfs_inode_fork.c index 80ba6c128..5ecfecaf4 100644 --- a/libxfs/xfs_inode_fork.c +++ b/libxfs/xfs_inode_fork.c @@ -590,7 +590,7 @@ void xfs_iflush_fork( xfs_inode_t *ip, xfs_dinode_t *dip, - xfs_inode_log_item_t *iip, + struct xfs_inode_log_item *iip, int whichfork) { char *cp; diff --git a/libxfs/xfs_trans_inode.c b/libxfs/xfs_trans_inode.c index f53b4c8df..068541256 100644 --- a/libxfs/xfs_trans_inode.c +++ b/libxfs/xfs_trans_inode.c @@ -24,7 +24,7 @@ xfs_trans_ijoin( struct xfs_inode *ip, uint lock_flags) { - xfs_inode_log_item_t *iip; + struct xfs_inode_log_item *iip; ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); if (ip->i_itemp == NULL) -- 2.50.1