[PATCH 12/23] mm: Use xas_erase() in collapse_file()

From: Jan Kara
Date: Wed Apr 22 2020 - 11:03:57 EST


When undoing failed collapse of ordinary pages into a huge page, use
xas_erase() to explicitly clear any xarray marks that may have been
added to entries.

Signed-off-by: Jan Kara <jack@xxxxxxx>
---
mm/khugepaged.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 99d77ffb79c2..8da820c02de7 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -1819,7 +1819,7 @@ static void collapse_file(struct mm_struct *mm,
break;
nr_none--;
/* Put holes back where they were */
- xas_store(&xas, NULL);
+ xas_erase(&xas);
continue;
}

--
2.16.4