Commit 4a65b7c2 authored by Brian Foster's avatar Brian Foster Committed by Darrick J. Wong
Browse files

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: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent fec0afda

fs/xfs/libxfs/xfs_alloc.c

+2 −16
Original line number Diff line number Diff line
@@ -1333,23 +1333,8 @@ xfs_alloc_ag_vextent_near( 
		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 @@ xfs_alloc_ag_vextent_near( 
		goto out;

	}



alloc:

	args->agbno = acur.bno;

	args->len = acur.len;

	ASSERT(acur.bno >= acur.rec_bno);