Commit df9727af authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: put link timeout req consistently 



Don't put linked timeout req in io_async_find_and_cancel() but do it in
io_link_timeout_fn(), so we have only one point for that and won't have
to do it differently as it's now (put vs put_deferred). Btw, improve a
bit io_async_find_and_cancel()'s locking.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/d75b70957f245275ab7cba83e0ac9c1b86aae78a.1617287883.git.asml.silence@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent c4ea060e

fs/io_uring.c

+3 −7
Original line number Diff line number Diff line
@@ -5766,12 +5766,9 @@ static void io_async_find_and_cancel(struct io_ring_ctx *ctx, 
	int ret;



	ret = io_async_cancel_one(req->task->io_uring, sqe_addr, ctx);

	if (ret != -ENOENT) {

	spin_lock_irqsave(&ctx->completion_lock, flags);

	if (ret != -ENOENT)

		goto done;

	}



	spin_lock_irqsave(&ctx->completion_lock, flags);

	ret = io_timeout_cancel(ctx, sqe_addr);

	if (ret != -ENOENT)

		goto done;
@@ -5786,7 +5783,6 @@ static void io_async_find_and_cancel(struct io_ring_ctx *ctx, 


	if (ret < 0)

		req_set_fail_links(req);

	io_put_req(req);

}



static int io_async_cancel_prep(struct io_kiocb *req,
@@ -6361,8 +6357,8 @@ static enum hrtimer_restart io_link_timeout_fn(struct hrtimer *timer) 
		io_put_req_deferred(prev, 1);

	} else {

		io_req_complete_post(req, -ETIME, 0);

		io_put_req_deferred(req, 1);

	}

	io_put_req_deferred(req, 1);

	return HRTIMER_NORESTART;

}