xfs: fix zone selection in xfs_select_open_zone_mru
PATCH 1/1 xfs: fix zone selection in xfs_select_open_zone_mru
xfs_select_open_zone_mru needs to pass XFS_ZONE_ALLOC_OK to xfs_try_use_zone because we only want to tightly pack into zones of the same or a compatible temperature instead of any available zone.
This got broken in commit 0301dae732a5 ("xfs: refactor hint based zone allocation"), which failed to update this particular caller when switching to an enum. xfs/638 sometimes, but not reliably fails due to this change.
--- fs/xfs/xfs_zone_alloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/xfs/xfs_zone_alloc.c +1 -1
@@ -615,7 +615,7 @@ xfs_select_open_zone_mru(lockdep_assert_held (&zi->zi_open_zones_lock);list_for_each_entry_reverse (oz, &zi->zi_open_zones, oz_entry) -if (xfs_try_use_zone (zi, file_hint, oz, false)) +if (xfs_try_use_zone (zi, file_hint, oz,XFS_ZONE_ALLOC_OK ))return oz;cond_resched_lock (&zi->zi_open_zones_lock);
Signature · 1 line
2.47.3
Quoted 20 lines · Christoph Hellwig
xfs_select_open_zone_mruneeds to passXFS_ZONE_ALLOC_OKtoxfs_try_use_zonebecause we only want to tightly pack into zones of the same or a compatible temperature instead of any available zone.This got broken in commit
0301dae732a5("xfs: refactor hint based zone allocation"), which failed to update this particular caller when switching to an enum. xfs/638 sometimes, but not reliably fails due to this change.Fixes 0301dae732a5 ("xfs: refactor hint based zone allocation")Signed-off-by Christoph Hellwig <[email protected]>--- fs/xfs/xfs_zone_alloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/xfs/xfs_zone_alloc.c +0
-0
fs/xfs/xfs_zone_alloc.c xfs_select_open_zone_mru( · line 621
Quoted 8 lines
fs/xfs/xfs_zone_alloc.c +1
-1@@ -615,7 +615,7 @@ xfs_select_open_zone_mru(lockdep_assert_held (&zi->zi_open_zones_lock);list_for_each_entry_reverse (oz, &zi->zi_open_zones, oz_entry) -if (xfs_try_use_zone (zi, file_hint, oz, false)) +if (xfs_try_use_zone (zi, file_hint, oz,XFS_ZONE_ALLOC_OK ))return oz;cond_resched_lock (&zi->zi_open_zones_lock);
Looks good,
Quoted 10 lines · Christoph Hellwig
xfs_select_open_zone_mruneeds to passXFS_ZONE_ALLOC_OKtoxfs_try_use_zonebecause we only want to tightly pack into zones of the same or a compatible temperature instead of any available zone.This got broken in commit
0301dae732a5("xfs: refactor hint based zone allocation"), which failed to update this particular caller when switching to an enum. xfs/638 sometimes, but not reliably fails due to this change.[...]
Applied to for-next, thanks!
[1/1] xfs: fix zone selection in xfs_select_open_zone_mru
commit: 21ab5179aafa2ded7f3851bfe7e043f8a3b6199d
Best regards,
Signature · 1 line
Carlos Maiolino <[email protected]>