From: Darrick J. Wong Date: Fri, 4 Sep 2020 19:53:20 +0000 (-0400) Subject: xfs: rename xfs_bmap_is_real_extent to is_written_extent X-Git-Tag: v5.9.0-rc0~49 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=23571db900f1f0172c7dea12f794450ec48b133f;p=thirdparty%2Fxfsprogs-dev.git xfs: rename xfs_bmap_is_real_extent to is_written_extent Source kernel commit: 877f58f53684f14ca3202640f70592bf44890924 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 Reviewed-by: Brian Foster Signed-off-by: Eric Sandeen --- diff --git a/libxfs/xfs_bmap.h b/libxfs/xfs_bmap.h index 6028a3c82..2b18338d0 100644 --- a/libxfs/xfs_bmap.h +++ b/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/libxfs/xfs_rtbitmap.c b/libxfs/xfs_rtbitmap.c index 4df279cd9..1bb5c75f8 100644 --- a/libxfs/xfs_rtbitmap.c +++ b/libxfs/xfs_rtbitmap.c @@ -68,7 +68,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);