xfs: remove XFS_ALLOCTYPE_ANY_AG and XFS_ALLOCTYPE_START_AG

Source kernel commit: 8d242e932fb7660c24b3a534197e69c241067e0d

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: 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_alloc.c b/libxfs/xfs_alloc.c
index 81695bfb18c6cd21e368c8ddf8bd3f016eff83f1..5e1576449f354cf9fe5713a26ef42a9f907aafd5 100644 (file)
--- a/libxfs/xfs_alloc.c
+++ b/libxfs/xfs_alloc.c
@@ -2661,21 +2661,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.
                         */
@@ -2684,8 +2674,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.
                         */
@@ -2753,7 +2741,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);

diff --git a/libxfs/xfs_alloc.h b/libxfs/xfs_alloc.h
index 1d0f48a501a3d6e9575b634ac022f30a91a2f309..2a8d0fa6fbbea3973f96183934d2ff2e0e581f53 100644 (file)
--- a/libxfs/xfs_alloc.h
+++ b/libxfs/xfs_alloc.h
@@ -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" }, \