On Wed, Apr 29, 2020 at 05:05:03PM +0200, Christoph Hellwig wrote:
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> fs/xfs/libxfs/xfs_inode_fork.c | 2 +-
> fs/xfs/libxfs/xfs_trans_inode.c | 2 +-
> fs/xfs/xfs_inode.c | 4 ++--
> fs/xfs/xfs_inode_item.c | 2 +-
> fs/xfs/xfs_inode_item.h | 4 ++--
> 5 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c
> index 518c6f0ec3a61..3e9a42f1e23b9 100644
> --- a/fs/xfs/libxfs/xfs_inode_fork.c
> +++ b/fs/xfs/libxfs/xfs_inode_fork.c
> @@ -592,7 +592,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/fs/xfs/libxfs/xfs_trans_inode.c b/fs/xfs/libxfs/xfs_trans_inode.c
> index 2b8ccb5b975df..b5dfb66548422 100644
> --- a/fs/xfs/libxfs/xfs_trans_inode.c
> +++ b/fs/xfs/libxfs/xfs_trans_inode.c
> @@ -27,7 +27,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)
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index d1772786af29d..0e2ef3f56be41 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -2602,7 +2602,7 @@ xfs_ifree_cluster(
> xfs_daddr_t blkno;
> xfs_buf_t *bp;
> xfs_inode_t *ip;
> - xfs_inode_log_item_t *iip;
> + struct xfs_inode_log_item *iip;
> struct xfs_log_item *lip;
> struct xfs_perag *pag;
> struct xfs_ino_geometry *igeo = M_IGEO(mp);
> @@ -2662,7 +2662,7 @@ xfs_ifree_cluster(
> */
> list_for_each_entry(lip, &bp->b_li_list, li_bio_list) {
> if (lip->li_type == XFS_LI_INODE) {
> - iip = (xfs_inode_log_item_t *)lip;
> + iip = (struct xfs_inode_log_item *)lip;
> ASSERT(iip->ili_logged == 1);
> lip->li_cb = xfs_istale_done;
> xfs_trans_ail_copy_lsn(mp->m_ail,
> diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
> index f779cca2346f3..75b74bbe38e43 100644
> --- a/fs/xfs/xfs_inode_item.c
> +++ b/fs/xfs/xfs_inode_item.c
> @@ -780,7 +780,7 @@ xfs_iflush_abort(
> xfs_inode_t *ip,
> bool stale)
> {
> - xfs_inode_log_item_t *iip = ip->i_itemp;
> + struct xfs_inode_log_item *iip = ip->i_itemp;
>
> if (iip) {
> if (test_bit(XFS_LI_IN_AIL, &iip->ili_item.li_flags)) {
> diff --git a/fs/xfs/xfs_inode_item.h b/fs/xfs/xfs_inode_item.h
> index 07a60e74c39c8..ad667fd4ae622 100644
> --- a/fs/xfs/xfs_inode_item.h
> +++ b/fs/xfs/xfs_inode_item.h
> @@ -13,7 +13,7 @@ struct xfs_bmbt_rec;
> struct xfs_inode;
> struct xfs_mount;
>
> -typedef struct xfs_inode_log_item {
> +struct xfs_inode_log_item {
> struct xfs_log_item ili_item; /* common portion */
> struct xfs_inode *ili_inode; /* inode ptr */
> xfs_lsn_t ili_flush_lsn; /* lsn at last flush */
> @@ -23,7 +23,7 @@ typedef struct xfs_inode_log_item {
> unsigned int ili_last_fields; /* fields when flushed */
> unsigned int ili_fields; /* fields to be logged */
> unsigned int ili_fsync_fields; /* logged since last fsync */
> -} xfs_inode_log_item_t;
> +};
>
> static inline int xfs_inode_clean(xfs_inode_t *ip)
> {
> --
> 2.26.2
>
