Commit 97db889b authored by Kemeng Shi's avatar Kemeng Shi Committed by Andrew Morton
Browse files

Xarray: distinguish large entries correctly in xas_split_alloc() 

We don't support large entries which expand two more level xa_node in
split.  For case "xas->xa_shift + 2 * XA_CHUNK_SHIFT == order", we also
need two level of xa_node to expand.  Distinguish entry as large entry in
case "xas->xa_shift + 2 * XA_CHUNK_SHIFT == order".

As max order of folio in pagecache (MAX_PAGECACHE_ORDER) is <=
(XA_CHUNK_SHIFT * 2 - 1), this change is more likely a cleanup...

Link: https://lkml.kernel.org/r/20241213122523.12764-4-shikemeng@huaweicloud.com


Signed-off-by: default avatarKemeng Shi <shikemeng@huaweicloud.com>
Cc: Mattew Wilcox <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent c9ba5249

lib/xarray.c

+1 −1
Original line number Diff line number Diff line
@@ -1027,7 +1027,7 @@ void xas_split_alloc(struct xa_state *xas, void *entry, unsigned int order, 
	unsigned int mask = xas->xa_sibs;



	/* XXX: no support for splitting really large entries yet */

	if (WARN_ON(xas->xa_shift + 2 * XA_CHUNK_SHIFT < order))

	if (WARN_ON(xas->xa_shift + 2 * XA_CHUNK_SHIFT <= order))

		goto nomem;

	if (xas->xa_shift + XA_CHUNK_SHIFT > order)

		return;