maple: fix incorrect rewinding in mas_empty_area_rev
Subsystems (2)
PATCH 1/1 maple: fix incorrect rewinding in mas_empty_area_rev
Previously, mas_empty_area_rev was rewinding to the previous node if some offset was cached. This could lead to incorrect results because a useful gap could be skipped. However, this was never triggered in the kernel because mm subsystem calls mas_empty_area_rev on non cached mas.
This patch unifies the rewind logic between mas_empty_area_rev and mas_empty_area, so they both rewind in their correct directions.
Signed-off-by Gladyshev Ilya <[email protected]>
--- lib/maple_tree.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
lib/maple_tree.c +5 -5
@@ -5138,15 +5138,15 @@ int mas_empty_area_rev(struct ma_state *mas, unsigned long min,if (mas_is_start (mas))mas_start (mas); -else if ((mas->offset <2 ) && (!mas_rewind_node (mas))) -return -EBUSY ;if (unlikely (mas_is_none (mas) ||mas_is_ptr (mas)))return mas_sparse_area (mas, min, max, size, false); -else if (mas->offset >=2 ) - mas->offset -=2 ; -else +else if (!mas->offset) mas->offset =mas_data_end (mas); +else if (mas->offset <=mas_data_end (mas) -2 ) + mas->offset = mas->offset +2 ; +else if (!mas_skip_node (mas)) +return -EBUSY ;/* The start of the window can only be within these values. */
Signature · 1 line
2.50.1