Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94e06399 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Kroah-Hartman
Browse files

xfs: remove the xfs_efi_log_item_t typedef 



commit 82ff450b2d936d778361a1de43eb078cc043c7fe upstream.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarChandan Babu R <chandan.babu@oracle.com>
Acked-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 83ef55c4

fs/xfs/xfs_extfree_item.c

+1 −1
Original line number Diff line number Diff line
@@ -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 {

fs/xfs/xfs_extfree_item.h

+5 −5
Original line number Diff line number Diff line
@@ -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,

fs/xfs/xfs_log_recover.c

+2 −2
Original line number Diff line number Diff line
@@ -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

fs/xfs/xfs_super.c

+1 −1
Original line number Diff line number Diff line
@@ -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)