From: Christoph Hellwig <hch@lst.de>
Date: Mon, 10 Aug 2020 20:32:04 +0000 (-0400)
Subject: xfs: remove the xfs_inode_log_item_t typedef
X-Git-Tag: v5.8.0-rc0~43
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ed8d09e12ec89791f6ea3b47c10bbc0d2ee9b035;p=thirdparty%2Fxfsprogs-dev.git

xfs: remove the xfs_inode_log_item_t typedef

Source kernel commit: fd9cbe51215198ccffa64169c98eae35b0916088

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

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..165eeb75b 100644
--- a/libxfs/logitem.c
+++ b/libxfs/logitem.c
@@ -132,10 +132,10 @@ xfs_buf_item_log(
  */
 void
 xfs_inode_item_init(
-	xfs_inode_t		*ip,
-	xfs_mount_t		*mp)
+	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..6e0b1667c 100644
--- a/libxfs/trans.c
+++ b/libxfs/trans.c
@@ -793,13 +793,13 @@ 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;
-	xfs_mount_t		*mp;
-	xfs_buf_t		*bp;
-	int			error;
+	xfs_dinode_t			*dip;
+	xfs_inode_t			*ip;
+	xfs_mount_t			*mp;
+	xfs_buf_t			*bp;
+	int				error;
 
 	ip = iip->ili_inode;
 	mp = iip->ili_item.li_mountp;
@@ -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 914e4ca58..dc3d050dd 100644
--- a/libxfs/util.c
+++ b/libxfs/util.c
@@ -351,11 +351,13 @@ libxfs_ialloc(
  * Originally based on xfs_iflush_int() from xfs_inode.c in the kernel.
  */
 int
-libxfs_iflush_int(xfs_inode_t *ip, xfs_buf_t *bp)
+libxfs_iflush_int(
+	xfs_inode_t			*ip,
+	xfs_buf_t			*bp)
 {
-	xfs_inode_log_item_t	*iip;
-	xfs_dinode_t		*dip;
-	xfs_mount_t		*mp;
+	struct xfs_inode_log_item	*iip;
+	xfs_dinode_t			*dip;
+	xfs_mount_t			*mp;
 
 	ASSERT(ip->i_d.di_format != XFS_DINODE_FMT_BTREE ||
 		ip->i_d.di_nextents > ip->i_df.if_ext_max);
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)