xfs: refactor allocation tree fixup code

Both algorithms duplicate the same btree allocation code. Eliminate
the duplication and reuse the fallback algorithm codepath.

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

diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
index 2b40842ef5f615a6df244be3b5dbb459ba93a4f5..6428d0a79213b79dee88b1386123d74fdc7125db 100644 (file)
--- a/fs/xfs/libxfs/xfs_alloc.c
+++ b/fs/xfs/libxfs/xfs_alloc.c
@@ -1333,23 +1333,8 @@ restart:
                if (acur.len == 0)
                        break;
 
-               /*
-                * Allocate at the bno/len tracked in the cursor.
-                */
-               args->agbno = acur.bno;
-               args->len = acur.len;
-               ASSERT(acur.bno >= acur.rec_bno);
-               ASSERT(acur.bno + acur.len <= acur.rec_bno + acur.rec_len);
-               ASSERT(acur.rec_bno + acur.rec_len <=
-                      be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length));
-
-               error = xfs_alloc_fixup_trees(acur.cnt, acur.bnolt,
-                               acur.rec_bno, acur.rec_len, acur.bno, acur.len,
-                               0);
-               if (error)
-                       goto out;
                trace_xfs_alloc_near_first(args);
-               goto out;
+               goto alloc;
        }
 
        /*
@@ -1434,6 +1419,7 @@ restart:
                goto out;
        }
 
+alloc:
        args->agbno = acur.bno;
        args->len = acur.len;
        ASSERT(acur.bno >= acur.rec_bno);