From: Darrick J. Wong <djwong@xxxxxxxxxx> Don't error out on CoW staging extent records when realtime reflink is enabled. Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> --- fs/xfs/libxfs/xfs_rmap.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/fs/xfs/libxfs/xfs_rmap.c b/fs/xfs/libxfs/xfs_rmap.c index 43108a195004c..501427d2f38cb 100644 --- a/fs/xfs/libxfs/xfs_rmap.c +++ b/fs/xfs/libxfs/xfs_rmap.c @@ -276,6 +276,7 @@ xfs_rtrmap_check_irec( bool is_unwritten; bool is_bmbt; bool is_attr; + bool is_cow; if (irec->rm_blockcount == 0) return __this_address; @@ -287,6 +288,12 @@ xfs_rtrmap_check_irec( return __this_address; if (irec->rm_offset != 0) return __this_address; + } else if (irec->rm_owner == XFS_RMAP_OWN_COW) { + if (!xfs_has_rtreflink(mp)) + return __this_address; + if (!xfs_verify_rgbext(rtg, irec->rm_startblock, + irec->rm_blockcount)) + return __this_address; } else { if (!xfs_verify_rgbext(rtg, irec->rm_startblock, irec->rm_blockcount)) @@ -303,8 +310,10 @@ xfs_rtrmap_check_irec( is_bmbt = irec->rm_flags & XFS_RMAP_BMBT_BLOCK; is_attr = irec->rm_flags & XFS_RMAP_ATTR_FORK; is_unwritten = irec->rm_flags & XFS_RMAP_UNWRITTEN; + is_cow = xfs_has_rtreflink(mp) && + irec->rm_owner == XFS_RMAP_OWN_COW; - if (!is_inode && irec->rm_owner != XFS_RMAP_OWN_FS) + if (!is_inode && !is_cow && irec->rm_owner != XFS_RMAP_OWN_FS) return __this_address; if (!is_inode && irec->rm_offset != 0) @@ -316,6 +325,9 @@ xfs_rtrmap_check_irec( if (is_unwritten && !is_inode) return __this_address; + if (is_unwritten && is_cow) + return __this_address; + /* Check for a valid fork offset, if applicable. */ if (is_inode && !xfs_verify_fileext(mp, irec->rm_offset, irec->rm_blockcount))