xfs: remove bmap block allocation retries

Source kernel commit: 7590632a33ef2d264665576d3d54e50f906fa758

Now that reflink operations don't set the firstblock value we don't
need the workarounds for non-NULL firstblock values without a prior
allocation.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index 9660a117997e311b1e911e5b2c7384a0dd5d31c8..61a9f72daf77fbb72325f5f571de6dd2b757d825 100644 (file)
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -755,7 +755,6 @@ xfs_bmap_extents_to_btree(
                args.fsbno = XFS_INO_TO_FSB(mp, ip->i_ino);
        } else if (dfops->dop_low) {
                args.type = XFS_ALLOCTYPE_START_BNO;
-try_another_ag:
                args.fsbno = *firstblock;
        } else {
                args.type = XFS_ALLOCTYPE_NEAR_BNO;
@@ -770,20 +769,6 @@ try_another_ag:
                return error;
        }
 
-       /*
-        * During a CoW operation, the allocation and bmbt updates occur in
-        * different transactions.  The mapping code tries to put new bmbt
-        * blocks near extents being mapped, but the only way to guarantee this
-        * is if the alloc and the mapping happen in a single transaction that
-        * has a block reservation.  That isn't the case here, so if we run out
-        * of space we'll try again with another AG.
-        */
-       if (xfs_sb_version_hasreflink(&cur->bc_mp->m_sb) &&
-           args.fsbno == NULLFSBLOCK &&
-           args.type == XFS_ALLOCTYPE_NEAR_BNO) {
-               args.type = XFS_ALLOCTYPE_FIRST_AG;
-               goto try_another_ag;
-       }
        if (WARN_ON_ONCE(args.fsbno == NULLFSBLOCK)) {
                xfs_iroot_realloc(ip, -1, whichfork);
                xfs_btree_del_cursor(cur, XFS_BTREE_ERROR);
@@ -916,7 +901,6 @@ xfs_bmap_local_to_extents(
         * file currently fits in an inode.
         */
        if (*firstblock == NULLFSBLOCK) {
-try_another_ag:
                args.fsbno = XFS_INO_TO_FSB(args.mp, ip->i_ino);
                args.type = XFS_ALLOCTYPE_START_BNO;
        } else {
@@ -929,19 +913,6 @@ try_another_ag:
        if (error)
                goto done;
 
-       /*
-        * During a CoW operation, the allocation and bmbt updates occur in
-        * different transactions.  The mapping code tries to put new bmbt
-        * blocks near extents being mapped, but the only way to guarantee this
-        * is if the alloc and the mapping happen in a single transaction that
-        * has a block reservation.  That isn't the case here, so if we run out
-        * of space we'll try again with another AG.
-        */
-       if (xfs_sb_version_hasreflink(&ip->i_mount->m_sb) &&
-           args.fsbno == NULLFSBLOCK &&
-           args.type == XFS_ALLOCTYPE_NEAR_BNO) {
-               goto try_another_ag;
-       }
        /* Can't fail, the space was reserved. */
        ASSERT(args.fsbno != NULLFSBLOCK);
        ASSERT(args.len == 1);

diff --git a/libxfs/xfs_bmap_btree.c b/libxfs/xfs_bmap_btree.c
index 34017b2e102d512c9724782e151cf51c11643ab3..0ffa72fb68f74b97338f01599ffdd0a5fb85431b 100644 (file)
--- a/libxfs/xfs_bmap_btree.c
+++ b/libxfs/xfs_bmap_btree.c
@@ -445,7 +445,6 @@ xfs_bmbt_alloc_block(
        if (args.fsbno == NULLFSBLOCK) {
                args.fsbno = be64_to_cpu(start->l);
                args.type = XFS_ALLOCTYPE_START_BNO;
-try_another_ag:
                /*
                 * Make sure there is sufficient room left in the AG to
                 * complete a full tree split for an extent insert.  If
@@ -474,22 +473,6 @@ try_another_ag:
        if (error)
                goto error0;
 
-       /*
-        * During a CoW operation, the allocation and bmbt updates occur in
-        * different transactions.  The mapping code tries to put new bmbt
-        * blocks near extents being mapped, but the only way to guarantee this
-        * is if the alloc and the mapping happen in a single transaction that
-        * has a block reservation.  That isn't the case here, so if we run out
-        * of space we'll try again with another AG.
-        */
-       if (xfs_sb_version_hasreflink(&cur->bc_mp->m_sb) &&
-           args.fsbno == NULLFSBLOCK &&
-           args.type == XFS_ALLOCTYPE_NEAR_BNO) {
-               args.fsbno = cur->bc_private.b.firstblock;
-               args.type = XFS_ALLOCTYPE_FIRST_AG;
-               goto try_another_ag;
-       }
-
        if (args.fsbno == NULLFSBLOCK && args.minleft) {
                /*
                 * Could not find an AG with enough free space to satisfy