Commit 877f58f5 authored by Darrick J. Wong's avatar Darrick J. Wong

xfs: rename xfs_bmap_is_real_extent to is_written_extent

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>
parent 83895227
...@@ -163,7 +163,7 @@ static inline int xfs_bmapi_whichfork(int bmapi_flags) ...@@ -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 * Return true if the extent is a real, allocated extent, or false if it is a
* delayed allocation, and unwritten extent or a hole. * 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 && return irec->br_state != XFS_EXT_UNWRITTEN &&
irec->br_startblock != HOLESTARTBLOCK && irec->br_startblock != HOLESTARTBLOCK &&
......
...@@ -70,7 +70,7 @@ xfs_rtbuf_get( ...@@ -70,7 +70,7 @@ xfs_rtbuf_get(
if (error) if (error)
return 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; return -EFSCORRUPTED;
ASSERT(map.br_startblock != NULLFSBLOCK); ASSERT(map.br_startblock != NULLFSBLOCK);
......
...@@ -179,7 +179,7 @@ xfs_reflink_trim_around_shared( ...@@ -179,7 +179,7 @@ xfs_reflink_trim_around_shared(
int error = 0; int error = 0;
/* Holes, unwritten, and delalloc extents cannot be shared */ /* 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; *shared = false;
return 0; return 0;
} }
...@@ -655,7 +655,7 @@ xfs_reflink_end_cow_extent( ...@@ -655,7 +655,7 @@ xfs_reflink_end_cow_extent(
* preallocations can leak into the range we are called upon, and we * preallocations can leak into the range we are called upon, and we
* need to skip them. * need to skip them.
*/ */
if (!xfs_bmap_is_real_extent(&got)) { if (!xfs_bmap_is_written_extent(&got)) {
*end_fsb = del.br_startoff; *end_fsb = del.br_startoff;
goto out_cancel; goto out_cancel;
} }
...@@ -996,7 +996,7 @@ xfs_reflink_remap_extent( ...@@ -996,7 +996,7 @@ xfs_reflink_remap_extent(
xfs_off_t new_isize) xfs_off_t new_isize)
{ {
struct xfs_mount *mp = ip->i_mount; 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; struct xfs_trans *tp;
unsigned int resblks; unsigned int resblks;
struct xfs_bmbt_irec uirec; struct xfs_bmbt_irec uirec;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment