Use xas_erase() to explicitely clear xarray marks when removing swap cache pages from the i_mapping xarray. Signed-off-by: Jan Kara <jack@xxxxxxx> --- mm/swap_state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/swap_state.c b/mm/swap_state.c index 1afbf68f1724..b5c8cbdcf8f0 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -167,7 +167,7 @@ void __delete_from_swap_cache(struct page *page, swp_entry_t entry) VM_BUG_ON_PAGE(PageWriteback(page), page); for (i = 0; i < nr; i++) { - void *entry = xas_store(&xas, NULL); + void *entry = xas_erase(&xas); VM_BUG_ON_PAGE(entry != page, entry); set_page_private(page + i, 0); xas_next(&xas); -- 2.16.4