diff options
| author | Darrick J. Wong <djwong@kernel.org> | 2023-02-17 15:44:25 -0800 |
|---|---|---|
| committer | Darrick J. Wong <djwong@kernel.org> | 2023-02-27 08:53:45 -0800 |
| commit | 6e2985c938e8b765b3de299c561d87f98330c546 (patch) | |
| tree | 9021657304f19e0a01c07bb32a7d3c9bcaf6c5cf | |
| parent | 60b730a40c43fbcc034970d3e77eb0f25b8cc1cf (diff) | |
xfs: restore old agirotor behaviorxfs-6.3-merge-4
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>
| -rw-r--r-- | fs/xfs/libxfs/xfs_ialloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c index 82ea6aa5af10..7ee292aecbeb 100644 --- a/fs/xfs/libxfs/xfs_ialloc.c +++ b/fs/xfs/libxfs/xfs_ialloc.c @@ -1729,7 +1729,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) |