]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
xfs: restore old agirotor behavior
authorDarrick J. Wong <djwong@kernel.org>
Tue, 9 May 2023 09:30:48 +0000 (11:30 +0200)
committerCarlos Maiolino <cem@kernel.org>
Wed, 10 May 2023 13:01:10 +0000 (15:01 +0200)
Source kernel commit: 6e2985c938e8b765b3de299c561d87f98330c546

Prior to the removal of xfs_ialloc_next_ag, we would increment the agi
rotor and return the *old* value.  atomic_inc_return returns the new
value, which causes mkfs to allocate the root directory in AG 1.  Put
back the old behavior (at least for mkfs) by subtracting 1 here.

Fixes: 20a5eab49d35 ("xfs: convert xfs_ialloc_next_ag() to an atomic")
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
libxfs/xfs_ialloc.c

index 791880a30e6453ef356c7869be1eddd9d10c1104..50ffa82034e5e08da75359aea064f593cf1b55a0 100644 (file)
@@ -1724,7 +1724,8 @@ xfs_dialloc(
         * an AG has enough space for file creation.
         */
        if (S_ISDIR(mode))
-               start_agno = atomic_inc_return(&mp->m_agirotor) % mp->m_maxagi;
+               start_agno = (atomic_inc_return(&mp->m_agirotor) - 1) %
+                               mp->m_maxagi;
        else {
                start_agno = XFS_INO_TO_AGNO(mp, parent);
                if (start_agno >= mp->m_maxagi)