xfs: fix confusing xfs_extent_item variable names

Source kernel commit: 578c714b215d474c52949e65a914dae67924f0fe

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>
Signed-off-by: Carlos Maiolino <cem@kernel.org>

diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c
index 80915ab471adbd66c32431660186eda617ce1af7..213d35b21f9f54ba2c8b7078614a9890c50c2696 100644 (file)
--- a/libxfs/xfs_alloc.c
+++ b/libxfs/xfs_alloc.c
@@ -2468,20 +2468,20 @@ xfs_defer_agfl_block(
        struct xfs_owner_info           *oinfo)
 {
        struct xfs_mount                *mp = tp->t_mountp;
-       struct xfs_extent_free_item     *new;           /* new element */
+       struct xfs_extent_free_item     *xefi;
 
        ASSERT(xfs_extfree_item_cache != NULL);
        ASSERT(oinfo != NULL);
 
-       new = kmem_cache_zalloc(xfs_extfree_item_cache,
+       xefi = kmem_cache_zalloc(xfs_extfree_item_cache,
                               GFP_KERNEL | __GFP_NOFAIL);
-       new->xefi_startblock = XFS_AGB_TO_FSB(mp, agno, agbno);
-       new->xefi_blockcount = 1;
-       new->xefi_owner = oinfo->oi_owner;
+       xefi->xefi_startblock = XFS_AGB_TO_FSB(mp, agno, agbno);
+       xefi->xefi_blockcount = 1;
+       xefi->xefi_owner = oinfo->oi_owner;
 
        trace_xfs_agfl_free_defer(mp, agno, 0, agbno, 1);
 
-       xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_AGFL_FREE, &new->xefi_list);
+       xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_AGFL_FREE, &xefi->xefi_list);
 }
 
 /*
@@ -2496,7 +2496,7 @@ __xfs_free_extent_later(
        const struct xfs_owner_info     *oinfo,
        bool                            skip_discard)
 {
-       struct xfs_extent_free_item     *new;           /* new element */
+       struct xfs_extent_free_item     *xefi;
 #ifdef DEBUG
        struct xfs_mount                *mp = tp->t_mountp;
        xfs_agnumber_t                  agno;
@@ -2515,27 +2515,27 @@ __xfs_free_extent_later(
 #endif
        ASSERT(xfs_extfree_item_cache != NULL);
 
-       new = kmem_cache_zalloc(xfs_extfree_item_cache,
+       xefi = kmem_cache_zalloc(xfs_extfree_item_cache,
                               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 (skip_discard)
-               new->xefi_flags |= XFS_EFI_SKIP_DISCARD;
+               xefi->xefi_flags |= XFS_EFI_SKIP_DISCARD;
        if (oinfo) {
                ASSERT(oinfo->oi_offset == 0);
 
                if (oinfo->oi_flags & XFS_OWNER_INFO_ATTR_FORK)
-                       new->xefi_flags |= XFS_EFI_ATTR_FORK;
+                       xefi->xefi_flags |= XFS_EFI_ATTR_FORK;
                if (oinfo->oi_flags & XFS_OWNER_INFO_BMBT_BLOCK)
-                       new->xefi_flags |= XFS_EFI_BMBT_BLOCK;
-               new->xefi_owner = oinfo->oi_owner;
+                       xefi->xefi_flags |= XFS_EFI_BMBT_BLOCK;
+               xefi->xefi_owner = oinfo->oi_owner;
        } else {
-               new->xefi_owner = XFS_RMAP_OWN_NULL;
+               xefi->xefi_owner = XFS_RMAP_OWN_NULL;
        }
        trace_xfs_bmap_free_defer(tp->t_mountp,
                        XFS_FSB_TO_AGNO(tp->t_mountp, bno), 0,
                        XFS_FSB_TO_AGBNO(tp->t_mountp, bno), len);
-       xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_FREE, &new->xefi_list);
+       xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_FREE, &xefi->xefi_list);
 }
 
 #ifdef DEBUG