xfs: remove the xfs_efi_log_item_t typedef

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>
This commit is contained in:
Christoph Hellwig 2020-04-30 12:52:18 -07:00 committed by Darrick J. Wong
parent 98b69b1285
commit 82ff450b2d
3 changed files with 8 additions and 8 deletions

View File

@ -161,7 +161,7 @@ xfs_efi_init(
ASSERT(nextents > 0); ASSERT(nextents > 0);
if (nextents > XFS_EFI_MAX_FAST_EXTENTS) { 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))); ((nextents - 1) * sizeof(xfs_extent_t)));
efip = kmem_zalloc(size, 0); efip = kmem_zalloc(size, 0);
} else { } else {

View File

@ -50,13 +50,13 @@ struct kmem_zone;
* of commit failure or log I/O errors. Note that the EFD is not inserted in the * 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. * 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; struct xfs_log_item efi_item;
atomic_t efi_refcount; atomic_t efi_refcount;
atomic_t efi_next_extent; atomic_t efi_next_extent;
unsigned long efi_flags; /* misc flags */ unsigned long efi_flags; /* misc flags */
xfs_efi_log_format_t efi_format; 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 * 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 { typedef struct xfs_efd_log_item {
struct xfs_log_item efd_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; uint efd_next_extent;
xfs_efd_log_format_t efd_format; xfs_efd_log_format_t efd_format;
} xfs_efd_log_item_t; } 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_efi_zone;
extern struct kmem_zone *xfs_efd_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, int xfs_efi_copy_format(xfs_log_iovec_t *buf,
xfs_efi_log_format_t *dst_efi_fmt); 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 *); void xfs_efi_release(struct xfs_efi_log_item *);
int xfs_efi_recover(struct xfs_mount *mp, int xfs_efi_recover(struct xfs_mount *mp,

View File

@ -3368,7 +3368,7 @@ xlog_recover_efd_pass2(
struct xlog_recover_item *item) struct xlog_recover_item *item)
{ {
xfs_efd_log_format_t *efd_formatp; 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; struct xfs_log_item *lip;
uint64_t efi_id; uint64_t efi_id;
struct xfs_ail_cursor cur; struct xfs_ail_cursor cur;
@ -3389,7 +3389,7 @@ xlog_recover_efd_pass2(
lip = xfs_trans_ail_cursor_first(ailp, &cur, 0); lip = xfs_trans_ail_cursor_first(ailp, &cur, 0);
while (lip != NULL) { while (lip != NULL) {
if (lip->li_type == XFS_LI_EFI) { 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) { if (efip->efi_format.efi_id == efi_id) {
/* /*
* Drop the EFD reference to the EFI. This * Drop the EFD reference to the EFI. This