diff mbox series

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

Message ID	20200422150256.23473-13-jack@suse.cz (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=GpHg=6G=vger.kernel.org=linux-fsdevel-owner@kernel.org> From: Jan Kara <jack@suse.cz> To: Matthew Wilcox <willy@infradead.org> Cc: <linux-fsdevel@vger.kernel.org>, LKML <linux-kernel@vger.kernel.org>, Jan Kara <jack@suse.cz> Subject: [PATCH 12/23] mm: Use xas_erase() in collapse_file() Date: Wed, 22 Apr 2020 17:02:45 +0200 Message-Id: <20200422150256.23473-13-jack@suse.cz> In-Reply-To: <20200422150256.23473-1-jack@suse.cz> References: <20200422150256.23473-1-jack@suse.cz> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk
Series	mm: Speedup page cache truncation \| expand [0/23,v2] mm: Speedup page cache truncation [01/23] xarray: Remove stale comment [02/23] xarray: Provide xas_erase() and xas_store_noinit() helpers [03/23] xarray: Use xas_store_noinit() in __xa_store, __xa_insert, __xa_alloc [04/23] xarray: Switch xa_store_range() to use xas_store_noinit() [05/23] xarray: Use xas_erase() in __xa_erase() [06/23] xarray: Explicitely set XA_FREE_MARK in __xa_cmpxchg() [07/23] xarray: Switch __xa_cmpxchg() to use xas_store_noinit() [08/23] dax: Use xas_erase() in __dax_invalidate_entry() [09/23] dax: Use dax_store_noinit() in grab_mapping_entry() [10/23] dax: Convert xas_store() to xas_store_noinit() [11/23] mm: Use xas_erase() in page_cache_delete_batch() [12/23] mm: Use xas_erase() in collapse_file() [13/23] mm: Use xas_store_noinit() when storing non-NULL [14/23] workingset: Use xas_store_noinit() to clear shadow entry [15/23] swap: Use xas_erase() when removing page from swap cache [16/23] idr: Use xas_erase() in ida_destroy() [17/23] idr: Use xas_erase() in ida_free() [18/23] idr: Convert xas_store() to xas_store_noinit() [19/23] testing: Use xas_erase() to remove entries from xarray [20/23] testing: Use xas_store_noinit() for non-NULL entries [21/23] testing: Introduce xa_erase_order() and use it [22/23] testing: Switch xa_store_order() to xas_store_noinit() [23/23] xarray: Remove xas_store()

Commit Message

Jan Kara April 22, 2020, 3:02 p.m. UTC

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@suse.cz>
---
 mm/khugepaged.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

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;
 			}