Re: [PATCH 2/9] xfs: rename xfs_bmap_is_real_extent to is_written_extent

[Brian Foster <bfoster@redhat.com>]

On Wed, Jun 24, 2020 at 06:17:52PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> The name of this predicate is a little misleading -- it decides if the
> extent mapping is allocated and written.  Change the name to be more
> direct, as we're going to add a new predicate in the next patch.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---

Reviewed-by: Brian Foster <bfoster@redhat.com>

>  fs/xfs/libxfs/xfs_bmap.h     |    2 +-
>  fs/xfs/libxfs/xfs_rtbitmap.c |    2 +-
>  fs/xfs/xfs_reflink.c         |    6 +++---
>  3 files changed, 5 insertions(+), 5 deletions(-)
> 
> 
> diff --git a/fs/xfs/libxfs/xfs_bmap.h b/fs/xfs/libxfs/xfs_bmap.h
> index 6028a3c825ba..2b18338d0643 100644
> --- a/fs/xfs/libxfs/xfs_bmap.h
> +++ b/fs/xfs/libxfs/xfs_bmap.h
> @@ -163,7 +163,7 @@ static inline int xfs_bmapi_whichfork(int bmapi_flags)
>   * Return true if the extent is a real, allocated extent, or false if it is  a
>   * delayed allocation, and unwritten extent or a hole.
>   */
> -static inline bool xfs_bmap_is_real_extent(struct xfs_bmbt_irec *irec)
> +static inline bool xfs_bmap_is_written_extent(struct xfs_bmbt_irec *irec)
>  {
>  	return irec->br_state != XFS_EXT_UNWRITTEN &&
>  		irec->br_startblock != HOLESTARTBLOCK &&
> diff --git a/fs/xfs/libxfs/xfs_rtbitmap.c b/fs/xfs/libxfs/xfs_rtbitmap.c
> index 9498ced947be..1d9fa8a300f1 100644
> --- a/fs/xfs/libxfs/xfs_rtbitmap.c
> +++ b/fs/xfs/libxfs/xfs_rtbitmap.c
> @@ -70,7 +70,7 @@ xfs_rtbuf_get(
>  	if (error)
>  		return error;
>  
> -	if (XFS_IS_CORRUPT(mp, nmap == 0 || !xfs_bmap_is_real_extent(&map)))
> +	if (XFS_IS_CORRUPT(mp, nmap == 0 || !xfs_bmap_is_written_extent(&map)))
>  		return -EFSCORRUPTED;
>  
>  	ASSERT(map.br_startblock != NULLFSBLOCK);
> diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
> index d89201d40891..22fdea6d69d3 100644
> --- a/fs/xfs/xfs_reflink.c
> +++ b/fs/xfs/xfs_reflink.c
> @@ -179,7 +179,7 @@ xfs_reflink_trim_around_shared(
>  	int			error = 0;
>  
>  	/* Holes, unwritten, and delalloc extents cannot be shared */
> -	if (!xfs_is_cow_inode(ip) || !xfs_bmap_is_real_extent(irec)) {
> +	if (!xfs_is_cow_inode(ip) || !xfs_bmap_is_written_extent(irec)) {
>  		*shared = false;
>  		return 0;
>  	}
> @@ -655,7 +655,7 @@ xfs_reflink_end_cow_extent(
>  	 * preallocations can leak into the range we are called upon, and we
>  	 * need to skip them.
>  	 */
> -	if (!xfs_bmap_is_real_extent(&got)) {
> +	if (!xfs_bmap_is_written_extent(&got)) {
>  		*end_fsb = del.br_startoff;
>  		goto out_cancel;
>  	}
> @@ -996,7 +996,7 @@ xfs_reflink_remap_extent(
>  	xfs_off_t		new_isize)
>  {
>  	struct xfs_mount	*mp = ip->i_mount;
> -	bool			real_extent = xfs_bmap_is_real_extent(irec);
> +	bool			real_extent = xfs_bmap_is_written_extent(irec);
>  	struct xfs_trans	*tp;
>  	unsigned int		resblks;
>  	struct xfs_bmbt_irec	uirec;
>