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

Commit 9c5e7c2a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: merge xfs_efd_init into xfs_trans_get_efd 



There is no good reason to keep these two functions separate.

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>
parent 95cf0e4a

fs/xfs/xfs_extfree_item.c

+15 −12
Original line number Diff line number Diff line
@@ -313,32 +313,35 @@ static const struct xfs_item_ops xfs_efd_item_ops = { 
};



/*

 * Allocate and initialize an efd item with the given number of extents.

 * Allocate an "extent free done" log item that will hold nextents worth of

 * extents.  The caller must use all nextents extents, because we are not

 * flexible about this at all.

 */

struct xfs_efd_log_item *

xfs_efd_init(

	struct xfs_mount	*mp,

xfs_trans_get_efd(

	struct xfs_trans		*tp,

	struct xfs_efi_log_item		*efip,

	uint			nextents)



	unsigned int			nextents)

{

	struct xfs_efd_log_item		*efdp;

	uint			size;



	ASSERT(nextents > 0);



	if (nextents > XFS_EFD_MAX_FAST_EXTENTS) {

		size = (uint)(sizeof(xfs_efd_log_item_t) +

			((nextents - 1) * sizeof(xfs_extent_t)));

		efdp = kmem_zalloc(size, KM_SLEEP);

		efdp = kmem_zalloc(sizeof(struct xfs_efd_log_item) +

				(nextents - 1) * sizeof(struct xfs_extent),

				KM_SLEEP);

	} else {

		efdp = kmem_zone_zalloc(xfs_efd_zone, KM_SLEEP);

	}



	xfs_log_item_init(mp, &efdp->efd_item, XFS_LI_EFD, &xfs_efd_item_ops);

	xfs_log_item_init(tp->t_mountp, &efdp->efd_item, XFS_LI_EFD,

			  &xfs_efd_item_ops);

	efdp->efd_efip = efip;

	efdp->efd_format.efd_nextents = nextents;

	efdp->efd_format.efd_efi_id = efip->efi_format.efi_id;



	xfs_trans_add_item(tp, &efdp->efd_item);

	return efdp;

}

fs/xfs/xfs_extfree_item.h

+0 −2
Original line number Diff line number Diff line
@@ -79,8 +79,6 @@ 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);

xfs_efd_log_item_t	*xfs_efd_init(struct xfs_mount *, xfs_efi_log_item_t *,

				      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 *);

fs/xfs/xfs_trans_extfree.c

+0 −26
Original line number Diff line number Diff line
@@ -19,32 +19,6 @@ 
#include "xfs_bmap.h"

#include "xfs_trace.h"



/*

 * This routine is called to allocate an "extent free done"

 * log item that will hold nextents worth of extents.  The

 * caller must use all nextents extents, because we are not

 * flexible about this at all.

 */

struct xfs_efd_log_item *

xfs_trans_get_efd(struct xfs_trans		*tp,

		  struct xfs_efi_log_item	*efip,

		  uint				nextents)

{

	struct xfs_efd_log_item			*efdp;



	ASSERT(tp != NULL);

	ASSERT(nextents > 0);



	efdp = xfs_efd_init(tp->t_mountp, efip, nextents);

	ASSERT(efdp != NULL);



	/*

	 * Get a log_item_desc to point at the new item.

	 */

	xfs_trans_add_item(tp, &efdp->efd_item);

	return efdp;

}



/*

 * Free an extent and log it to the EFD. Note that the transaction is marked

 * dirty regardless of whether the extent free succeeds or fails to support the