diff options
| author | Darrick J. Wong <djwong@kernel.org> | 2023-02-01 10:16:02 -0800 | 
|---|---|---|
| committer | Darrick J. Wong <djwong@kernel.org> | 2023-02-05 08:48:11 -0800 | 
| commit | 578c714b215d474c52949e65a914dae67924f0fe (patch) | |
| tree | 859eda805f8e0aabddccdc5999e2389054d1006e /fs/xfs/libxfs/xfs_alloc.c | |
| parent | 72ba455599ad13d08c29dafa22a32360e07b1961 (diff) | |
xfs: fix confusing xfs_extent_item variable names
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>
Diffstat (limited to 'fs/xfs/libxfs/xfs_alloc.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_alloc.c | 32 | 
1 files changed, 16 insertions, 16 deletions
diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c index 989cf341779b..f8ff81c3de76 100644 --- a/fs/xfs/libxfs/xfs_alloc.c +++ b/fs/xfs/libxfs/xfs_alloc.c @@ -2472,20 +2472,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);  }  /* @@ -2500,7 +2500,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; @@ -2519,27 +2519,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  | 
