xfs: teach xfs_bmapi_remap to accept some bmapi flags

Source kernel commit: 7644bd988d911168c80599bc034bb489dc851dcf

Teach xfs_bmapi_remap how to map in unwritten extent and to skip rmap
updates.  This enables us to rebuild real and unwritten extents from the
rmapbt.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index 828ed33466a97d2acf449c9ae9f89c7eb1586be1..a81f6b40b54a7a4e44f25c7dcce6b1b5f469105d 100644 (file)
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -4534,7 +4534,10 @@ xfs_bmapi_remap(
        ASSERT(len > 0);
        ASSERT(len <= (xfs_filblks_t)MAXEXTLEN);
        ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
-       ASSERT(!(flags & ~(XFS_BMAPI_ATTRFORK)));
+       ASSERT(!(flags & ~(XFS_BMAPI_ATTRFORK | XFS_BMAPI_PREALLOC |
+                          XFS_BMAPI_NORMAP)));
+       ASSERT((flags & (XFS_BMAPI_ATTRFORK | XFS_BMAPI_PREALLOC)) !=
+                       (XFS_BMAPI_ATTRFORK | XFS_BMAPI_PREALLOC));
 
        if (unlikely(XFS_TEST_ERROR(
            (XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS &&
@@ -4572,7 +4575,10 @@ xfs_bmapi_remap(
        got.br_startoff = bno;
        got.br_startblock = startblock;
        got.br_blockcount = len;
-       got.br_state = XFS_EXT_NORM;
+       if (flags & XFS_BMAPI_PREALLOC)
+               got.br_state = XFS_EXT_UNWRITTEN;
+       else
+               got.br_state = XFS_EXT_NORM;
 
        error = xfs_bmap_add_extent_hole_real(tp, ip, whichfork, &icur,
                        &cur, &got, &firstblock, dfops, &logflags, flags);