Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d242e93 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: remove XFS_ALLOCTYPE_ANY_AG and XFS_ALLOCTYPE_START_AG 



XFS_ALLOCTYPE_ANY_AG  was only used for the RT allocator and is unused
now, and XFS_ALLOCTYPE_START_AG has been unused for a while.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 089ec2f8

fs/xfs/libxfs/xfs_alloc.c

+2 −14
Original line number Diff line number Diff line
@@ -2664,21 +2664,11 @@ xfs_alloc_vextent( 
		args->agbno = XFS_FSB_TO_AGBNO(mp, args->fsbno);

		args->type = XFS_ALLOCTYPE_NEAR_BNO;

		/* FALLTHROUGH */

	case XFS_ALLOCTYPE_ANY_AG:

	case XFS_ALLOCTYPE_START_AG:

	case XFS_ALLOCTYPE_FIRST_AG:

		/*

		 * Rotate through the allocation groups looking for a winner.

		 */

		if (type == XFS_ALLOCTYPE_ANY_AG) {

			/*

			 * Start with the last place we left off.

			 */

			args->agno = sagno = (mp->m_agfrotor / rotorstep) %

					mp->m_sb.sb_agcount;

			args->type = XFS_ALLOCTYPE_THIS_AG;

			flags = XFS_ALLOC_FLAG_TRYLOCK;

		} else if (type == XFS_ALLOCTYPE_FIRST_AG) {

		if (type == XFS_ALLOCTYPE_FIRST_AG) {

			/*

			 * Start with allocation group given by bno.

			 */
@@ -2687,8 +2677,6 @@ xfs_alloc_vextent( 
			sagno = 0;

			flags = 0;

		} else {

			if (type == XFS_ALLOCTYPE_START_AG)

				args->type = XFS_ALLOCTYPE_THIS_AG;

			/*

			 * Start with the given allocation group.

			 */
@@ -2756,7 +2744,7 @@ xfs_alloc_vextent( 
			}

			xfs_perag_put(args->pag);

		}

		if (bump_rotor || (type == XFS_ALLOCTYPE_ANY_AG)) {

		if (bump_rotor) {

			if (args->agno == sagno)

				mp->m_agfrotor = (mp->m_agfrotor + 1) %

					(mp->m_sb.sb_agcount * rotorstep);

fs/xfs/libxfs/xfs_alloc.h

+0 −4
Original line number Diff line number Diff line
@@ -29,9 +29,7 @@ extern struct workqueue_struct *xfs_alloc_wq; 
/*

 * Freespace allocation types.  Argument to xfs_alloc_[v]extent.

 */

#define XFS_ALLOCTYPE_ANY_AG	0x01	/* allocate anywhere, use rotor */

#define XFS_ALLOCTYPE_FIRST_AG	0x02	/* ... start at ag 0 */

#define XFS_ALLOCTYPE_START_AG	0x04	/* anywhere, start in this a.g. */

#define XFS_ALLOCTYPE_THIS_AG	0x08	/* anywhere in this a.g. */

#define XFS_ALLOCTYPE_START_BNO	0x10	/* near this block else anywhere */

#define XFS_ALLOCTYPE_NEAR_BNO	0x20	/* in this a.g. and near this block */
@@ -41,9 +39,7 @@ extern struct workqueue_struct *xfs_alloc_wq; 
typedef unsigned int xfs_alloctype_t;



#define XFS_ALLOC_TYPES \

	{ XFS_ALLOCTYPE_ANY_AG,		"ANY_AG" }, \

	{ XFS_ALLOCTYPE_FIRST_AG,	"FIRST_AG" }, \

	{ XFS_ALLOCTYPE_START_AG,	"START_AG" }, \

	{ XFS_ALLOCTYPE_THIS_AG,	"THIS_AG" }, \

	{ XFS_ALLOCTYPE_START_BNO,	"START_BNO" }, \

	{ XFS_ALLOCTYPE_NEAR_BNO,	"NEAR_BNO" }, \