Commit 5e2ed8c4 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Jens Axboe
Browse files

io_uring: Convert advanced XArray uses to the normal API 



There are no bugs here that I've spotted, it's just easier to use the
normal API and there are no performance advantages to using the more
verbose advanced API.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 236434c3

fs/io_uring.c

+2 −12
Original line number Diff line number Diff line
@@ -8615,27 +8615,17 @@ static int io_uring_add_task_file(struct file *file) 
static void io_uring_del_task_file(struct file *file)

{

	struct io_uring_task *tctx = current->io_uring;

	XA_STATE(xas, &tctx->xa, (unsigned long) file);



	if (tctx->last == file)

		tctx->last = NULL;



	xas_lock(&xas);

	file = xas_store(&xas, NULL);

	xas_unlock(&xas);



	file = xa_erase(&tctx->xa, (unsigned long)file);

	if (file)

		fput(file);

}



static void __io_uring_attempt_task_drop(struct file *file)

{

	XA_STATE(xas, &current->io_uring->xa, (unsigned long) file);

	struct file *old;



	rcu_read_lock();

	old = xas_load(&xas);

	rcu_read_unlock();

	struct file *old = xa_load(&current->io_uring->xa, (unsigned long)file);



	if (old == file)

		io_uring_del_task_file(file);