Commit 13fd5cf3 authored by Kemeng Shi's avatar Kemeng Shi Committed by Andrew Morton
Browse files

Xarray: use xa_mark_t in xas_squash_marks() to keep code consistent 

Besides xas_squash_marks(), all functions use xa_mark_t type to iterate
all possible marks.  Use xa_mark_t in xas_squash_marks() to keep code
consistent.

Link: https://lkml.kernel.org/r/20241213122523.12764-6-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 1988b318

lib/xarray.c

+12 −8
Original line number Diff line number Diff line
@@ -125,16 +125,20 @@ static inline void node_mark_all(struct xa_node *node, xa_mark_t mark) 
 */

static void xas_squash_marks(const struct xa_state *xas)

{

	unsigned int mark = 0;

	xa_mark_t mark = 0;

	unsigned int limit = xas->xa_offset + xas->xa_sibs + 1;



	do {

		unsigned long *marks = xas->xa_node->marks[mark];

		if (find_next_bit(marks, limit, xas->xa_offset + 1) == limit)

			continue;

	for (;;) {

		unsigned long *marks = node_marks(xas->xa_node, mark);



		if (find_next_bit(marks, limit, xas->xa_offset + 1) != limit) {

			__set_bit(xas->xa_offset, marks);

			bitmap_clear(marks, xas->xa_offset + 1, xas->xa_sibs);

	} while (mark++ != (__force unsigned)XA_MARK_MAX);

		}

		if (mark == XA_MARK_MAX)

			break;

		mark_inc(mark);

	}

}



/* extracts the offset within this node from the index */