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

Commit ece1eb99 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Greg Kroah-Hartman
Browse files

xfs: rename xfs_bmap_is_real_extent to is_written_extent 



commit 877f58f53684f14ca3202640f70592bf44890924 upstream.

[ Slightly modify fs/xfs/libxfs/xfs_rtbitmap.c & fs/xfs/xfs_reflink.c to
  resolve merge conflict ]

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: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Acked-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarChandan Babu R <chandan.babu@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d304fafb

fs/xfs/libxfs/xfs_bmap.h

+1 −1
Original line number Diff line number Diff line
@@ -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 &&

fs/xfs/libxfs/xfs_rtbitmap.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ xfs_rtbuf_get( 
	if (error)

		return error;



	if (nmap == 0 || !xfs_bmap_is_real_extent(&map)) {

	if (nmap == 0 || !xfs_bmap_is_written_extent(&map)) {

		XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, mp);

		return -EFSCORRUPTED;

	}

fs/xfs/xfs_reflink.c

+4 −4
Original line number Diff line number Diff line
@@ -181,7 +181,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;

	}
@@ -657,7 +657,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;

	}
@@ -998,7 +998,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;
@@ -1427,7 +1427,7 @@ xfs_reflink_dirty_extents( 
			goto out;

		if (nmaps == 0)

			break;

		if (!xfs_bmap_is_real_extent(&map[0]))

		if (!xfs_bmap_is_written_extent(&map[0]))

			goto next;



		map[1] = map[0];