xfs: remove the xfs_efi_log_item_t typedef

commit f19325a95b6e52c6159210714f45aaa296bc8d87 upstream.

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: Chandan Babu R <chandan.babu@oracle.com>
Acked-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c
index a05a1074e8f81e50823536537886c114964b6e39..d3ee862086fb426b53e572c3e3ffac229f620ac9 100644 (file)
--- a/fs/xfs/xfs_extfree_item.c
+++ b/fs/xfs/xfs_extfree_item.c
@@ -161,7 +161,7 @@ xfs_efi_init(
 
        ASSERT(nextents > 0);
        if (nextents > XFS_EFI_MAX_FAST_EXTENTS) {
-               size = (uint)(sizeof(xfs_efi_log_item_t) +
+               size = (uint)(sizeof(struct xfs_efi_log_item) +
                        ((nextents - 1) * sizeof(xfs_extent_t)));
                efip = kmem_zalloc(size, 0);
        } else {

diff --git a/fs/xfs/xfs_extfree_item.h b/fs/xfs/xfs_extfree_item.h
index 16aaab06d4ecc55afa09f1d7880ef41a225ad82b..b9b567f3557561821eb9f962673fbf70753bc288 100644 (file)
--- a/fs/xfs/xfs_extfree_item.h
+++ b/fs/xfs/xfs_extfree_item.h
@@ -50,13 +50,13 @@ struct kmem_zone;
  * of commit failure or log I/O errors. Note that the EFD is not inserted in the
  * AIL, so at this point both the EFI and EFD are freed.
  */
-typedef struct xfs_efi_log_item {
+struct xfs_efi_log_item {
        struct xfs_log_item     efi_item;
        atomic_t                efi_refcount;
        atomic_t                efi_next_extent;
        unsigned long           efi_flags;      /* misc flags */
        xfs_efi_log_format_t    efi_format;
-} xfs_efi_log_item_t;
+};
 
 /*
  * This is the "extent free done" log item.  It is used to log
@@ -65,7 +65,7 @@ typedef struct xfs_efi_log_item {
  */
 typedef struct xfs_efd_log_item {
        struct xfs_log_item     efd_item;
-       xfs_efi_log_item_t      *efd_efip;
+       struct xfs_efi_log_item *efd_efip;
        uint                    efd_next_extent;
        xfs_efd_log_format_t    efd_format;
 } xfs_efd_log_item_t;
@@ -78,10 +78,10 @@ typedef struct xfs_efd_log_item {
 extern struct kmem_zone        *xfs_efi_zone;
 extern struct kmem_zone        *xfs_efd_zone;
 
-xfs_efi_log_item_t     *xfs_efi_init(struct xfs_mount *, uint);
+struct xfs_efi_log_item        *xfs_efi_init(struct xfs_mount *, uint);
 int                    xfs_efi_copy_format(xfs_log_iovec_t *buf,
                                            xfs_efi_log_format_t *dst_efi_fmt);
-void                   xfs_efi_item_free(xfs_efi_log_item_t *);
+void                   xfs_efi_item_free(struct xfs_efi_log_item *);
 void                   xfs_efi_release(struct xfs_efi_log_item *);
 
 int                    xfs_efi_recover(struct xfs_mount *mp,

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 46b1e255f55fc90e673ddd0f0e5d008a386707cf..cffa9b695de8878a89da8f09ce482b0371cf5caf 100644 (file)
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -3384,7 +3384,7 @@ xlog_recover_efd_pass2(
        struct xlog_recover_item        *item)
 {
        xfs_efd_log_format_t    *efd_formatp;
-       xfs_efi_log_item_t      *efip = NULL;
+       struct xfs_efi_log_item *efip = NULL;
        struct xfs_log_item     *lip;
        uint64_t                efi_id;
        struct xfs_ail_cursor   cur;
@@ -3405,7 +3405,7 @@ xlog_recover_efd_pass2(
        lip = xfs_trans_ail_cursor_first(ailp, &cur, 0);
        while (lip != NULL) {
                if (lip->li_type == XFS_LI_EFI) {
-                       efip = (xfs_efi_log_item_t *)lip;
+                       efip = (struct xfs_efi_log_item *)lip;
                        if (efip->efi_format.efi_id == efi_id) {
                                /*
                                 * Drop the EFD reference to the EFI. This

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index f1407900aeef90f0dc0f2d76c4f45515375d693d..b86612699a15f92391e341369b538c6a99a6dcc2 100644 (file)
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1920,7 +1920,7 @@ xfs_init_zones(void)
        if (!xfs_efd_zone)
                goto out_destroy_buf_item_zone;
 
-       xfs_efi_zone = kmem_zone_init((sizeof(xfs_efi_log_item_t) +
+       xfs_efi_zone = kmem_zone_init((sizeof(struct xfs_efi_log_item) +
                        ((XFS_EFI_MAX_FAST_EXTENTS - 1) *
                                sizeof(xfs_extent_t))), "xfs_efi_item");
        if (!xfs_efi_zone)