xfs: fix confusing xfs_extent_item variable namesrealtime-extfree-intents_2021-10-22

Change the name of all pointers to xfs_extent_item structures to "xefi"
to make the name consistent and because the current selections ("new"
and "free") mean other things in C.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>

2 files changed, 46 insertions, 46 deletions

diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
index e21824d53dc5..b56727d0fa70 100644
--- a/fs/xfs/libxfs/xfs_alloc.c
+++ b/fs/xfs/libxfs/xfs_alloc.c
@@ -2550,7 +2550,7 @@ xfs_free_extent_later(
 	const struct xfs_owner_info	*oinfo,
 	unsigned int			flags)
 {
-	struct xfs_extent_free_item	*new;		/* new element */
+	struct xfs_extent_free_item	*xefi;		/* new element */
 #ifdef DEBUG
 	struct xfs_mount		*mp = tp->t_mountp;
 
@@ -2577,20 +2577,20 @@ xfs_free_extent_later(
 #endif
 	ASSERT(xfs_extent_free_item_zone != NULL);
 
-	new = kmem_cache_alloc(xfs_extent_free_item_zone,
+	xefi = kmem_cache_alloc(xfs_extent_free_item_zone,
 			       GFP_KERNEL | __GFP_NOFAIL);
-	new->xefi_startblock = bno;
-	new->xefi_blockcount = (xfs_extlen_t)len;
+	xefi->xefi_startblock = bno;
+	xefi->xefi_blockcount = (xfs_extlen_t)len;
 	if (oinfo)
-		new->xefi_oinfo = *oinfo;
+		xefi->xefi_oinfo = *oinfo;
 	else
-		new->xefi_oinfo = XFS_RMAP_OINFO_SKIP_UPDATE;
-	new->xefi_skip_discard = !!(flags & XFS_FREE_EXTENT_SKIP_DISCARD);
-	new->xefi_realtime = !!(flags & XFS_FREE_EXTENT_REALTIME);
+		xefi->xefi_oinfo = XFS_RMAP_OINFO_SKIP_UPDATE;
+	xefi->xefi_skip_discard = !!(flags & XFS_FREE_EXTENT_SKIP_DISCARD);
+	xefi->xefi_realtime = !!(flags & XFS_FREE_EXTENT_REALTIME);
 
 	trace_xfs_extent_free_defer(tp->t_mountp, XFS_FREE_EXTENT_REGULAR,
-			new);
-	xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_FREE, &new->xefi_list);
+			xefi);
+	xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_FREE, &xefi->xefi_list);
 }
 
 
diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c
index 3d630faf26b0..f93b033b447e 100644
--- a/fs/xfs/xfs_extfree_item.c
+++ b/fs/xfs/xfs_extfree_item.c
@@ -358,22 +358,22 @@ static int
 xfs_trans_free_extent(
 	struct xfs_trans		*tp,
 	struct xfs_efd_log_item		*efdp,
-	struct xfs_extent_free_item	*free)
+	struct xfs_extent_free_item	*xefi)
 {
 	struct xfs_mount		*mp = tp->t_mountp;
 	struct xfs_extent		*extp;
 	uint				next_extent;
 	int				error;
 
-	trace_xfs_extent_free_deferred(mp, XFS_FREE_EXTENT_REGULAR, free);
+	trace_xfs_extent_free_deferred(mp, XFS_FREE_EXTENT_REGULAR, xefi);
 
-	if (free->xefi_realtime) {
-		error = xfs_rtfree_blocks(tp, free->xefi_startblock,
-				free->xefi_blockcount);
+	if (xefi->xefi_realtime) {
+		error = xfs_rtfree_blocks(tp, xefi->xefi_startblock,
+				xefi->xefi_blockcount);
 	} else {
-		error = __xfs_free_extent(tp, free->xefi_startblock,
-				free->xefi_blockcount, &free->xefi_oinfo,
-				XFS_AG_RESV_NONE, free->xefi_skip_discard);
+		error = __xfs_free_extent(tp, xefi->xefi_startblock,
+				xefi->xefi_blockcount, &xefi->xefi_oinfo,
+				XFS_AG_RESV_NONE, xefi->xefi_skip_discard);
 	}
 
 	/*
@@ -389,8 +389,8 @@ xfs_trans_free_extent(
 	next_extent = efdp->efd_next_extent;
 	ASSERT(next_extent < efdp->efd_format.efd_nextents);
 	extp = &(efdp->efd_format.efd_extents[next_extent]);
-	extp->ext_start = free->xefi_startblock;
-	extp->ext_len = free->xefi_blockcount;
+	extp->ext_start = xefi->xefi_startblock;
+	extp->ext_len = xefi->xefi_blockcount;
 	efdp->efd_next_extent++;
 
 	return error;
@@ -426,7 +426,7 @@ STATIC void
 xfs_extent_free_log_item(
 	struct xfs_trans		*tp,
 	struct xfs_efi_log_item		*efip,
-	struct xfs_extent_free_item	*free)
+	struct xfs_extent_free_item	*xefi)
 {
 	uint				next_extent;
 	struct xfs_extent		*extp;
@@ -442,9 +442,9 @@ xfs_extent_free_log_item(
 	next_extent = atomic_inc_return(&efip->efi_next_extent) - 1;
 	ASSERT(next_extent < efip->efi_format.efi_nextents);
 	extp = &efip->efi_format.efi_extents[next_extent];
-	extp->ext_start = free->xefi_startblock;
-	extp->ext_len = free->xefi_blockcount;
-	if (free->xefi_realtime)
+	extp->ext_start = xefi->xefi_startblock;
+	extp->ext_len = xefi->xefi_blockcount;
+	if (xefi->xefi_realtime)
 		extp->ext_len |= XFS_EFI_REALTIME_EXT;
 }
 
@@ -457,15 +457,15 @@ xfs_extent_free_create_intent(
 {
 	struct xfs_mount		*mp = tp->t_mountp;
 	struct xfs_efi_log_item		*efip = xfs_efi_init(mp, count);
-	struct xfs_extent_free_item	*free;
+	struct xfs_extent_free_item	*xefi;
 
 	ASSERT(count > 0);
 
 	xfs_trans_add_item(tp, &efip->efi_item);
 	if (sort)
 		list_sort(mp, items, xfs_extent_free_diff_items);
-	list_for_each_entry(free, items, xefi_list)
-		xfs_extent_free_log_item(tp, efip, free);
+	list_for_each_entry(xefi, items, xefi_list)
+		xfs_extent_free_log_item(tp, efip, xefi);
 	return &efip->efi_item;
 }
 
@@ -487,22 +487,22 @@ xfs_extent_free_finish_item(
 	struct list_head		*item,
 	struct xfs_btree_cur		**state)
 {
-	struct xfs_extent_free_item	*free;
+	struct xfs_extent_free_item	*xefi;
 	int				error;
 
-	free = container_of(item, struct xfs_extent_free_item, xefi_list);
+	xefi = container_of(item, struct xfs_extent_free_item, xefi_list);
 
 	/*
 	 * Lock the rt bitmap if we've any realtime extents to free and we
 	 * haven't locked the rt inodes yet.
 	 */
-	if (*state == NULL && free->xefi_realtime) {
+	if (*state == NULL && xefi->xefi_realtime) {
 		xfs_rtlock(tp, tp->t_mountp, XFS_RTLOCK_ALLOC);
 		*state = (struct xfs_btree_cur *)1;
 	}
 
-	error = xfs_trans_free_extent(tp, EFD_ITEM(done), free);
-	kmem_free(free);
+	error = xfs_trans_free_extent(tp, EFD_ITEM(done), xefi);
+	kmem_free(xefi);
 	return error;
 }
 
@@ -519,10 +519,10 @@ STATIC void
 xfs_extent_free_cancel_item(
 	struct list_head		*item)
 {
-	struct xfs_extent_free_item	*free;
+	struct xfs_extent_free_item	*xefi;
 
-	free = container_of(item, struct xfs_extent_free_item, xefi_list);
-	kmem_free(free);
+	xefi = container_of(item, struct xfs_extent_free_item, xefi_list);
+	kmem_free(xefi);
 }
 
 const struct xfs_defer_op_type xfs_extent_free_defer_type = {
@@ -547,7 +547,7 @@ xfs_agfl_free_finish_item(
 {
 	struct xfs_mount		*mp = tp->t_mountp;
 	struct xfs_efd_log_item		*efdp = EFD_ITEM(done);
-	struct xfs_extent_free_item	*free;
+	struct xfs_extent_free_item	*xefi;
 	struct xfs_extent		*extp;
 	struct xfs_buf			*agbp;
 	int				error;
@@ -555,18 +555,18 @@ xfs_agfl_free_finish_item(
 	xfs_agblock_t			agbno;
 	uint				next_extent;
 
-	free = container_of(item, struct xfs_extent_free_item, xefi_list);
-	ASSERT(free->xefi_blockcount == 1);
-	ASSERT(!free->xefi_realtime);
-	agno = XFS_FSB_TO_AGNO(mp, free->xefi_startblock);
-	agbno = XFS_FSB_TO_AGBNO(mp, free->xefi_startblock);
+	xefi = container_of(item, struct xfs_extent_free_item, xefi_list);
+	ASSERT(xefi->xefi_blockcount == 1);
+	ASSERT(!xefi->xefi_realtime);
+	agno = XFS_FSB_TO_AGNO(mp, xefi->xefi_startblock);
+	agbno = XFS_FSB_TO_AGBNO(mp, xefi->xefi_startblock);
 
-	trace_xfs_extent_free_deferred(mp, XFS_FREE_EXTENT_AGFL, free);
+	trace_xfs_extent_free_deferred(mp, XFS_FREE_EXTENT_AGFL, xefi);
 
 	error = xfs_alloc_read_agf(mp, tp, agno, 0, &agbp);
 	if (!error)
 		error = xfs_free_agfl_block(tp, agno, agbno, agbp,
-					    &free->xefi_oinfo);
+					    &xefi->xefi_oinfo);
 
 	/*
 	 * Mark the transaction dirty, even on error. This ensures the
@@ -581,11 +581,11 @@ xfs_agfl_free_finish_item(
 	next_extent = efdp->efd_next_extent;
 	ASSERT(next_extent < efdp->efd_format.efd_nextents);
 	extp = &(efdp->efd_format.efd_extents[next_extent]);
-	extp->ext_start = free->xefi_startblock;
-	extp->ext_len = free->xefi_blockcount;
+	extp->ext_start = xefi->xefi_startblock;
+	extp->ext_len = xefi->xefi_blockcount;
 	efdp->efd_next_extent++;
 
-	kmem_free(free);
+	kmem_free(xefi);
 	return error;
 }