diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2023-04-13 16:28:10 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-04-15 22:44:57 +0200 |
| commit | 0b222eeb6514ba6c3457b667fa4f3645032e1fc9 (patch) | |
| tree | ae98c04f8ce68425ddbeba1777c69150e18bbd78 /io_uring/io_uring.c | |
| parent | io_uring/rsrc: fix DEFER_TASKRUN rsrc quiesce (diff) | |
| download | linux-0b222eeb6514ba6c3457b667fa4f3645032e1fc9.tar.xz linux-0b222eeb6514ba6c3457b667fa4f3645032e1fc9.zip | |
io_uring/rsrc: remove rsrc_data refs
Instead of waiting for rsrc_data->refs to be downed to zero, check
whether there are rsrc nodes queued for completion, that's easier then
maintaining references.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/8e33fd143d83e11af3e386aea28eb6d6c6a1be10.1681395792.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring/io_uring.c')
| -rw-r--r-- | io_uring/io_uring.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 3c1c8c788b7b..3d43df8f1e4e 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -2831,8 +2831,8 @@ static __cold void io_ring_ctx_free(struct io_ring_ctx *ctx) { io_sq_thread_finish(ctx); /* __io_rsrc_put_work() may need uring_lock to progress, wait w/o it */ - io_wait_rsrc_data(ctx->buf_data); - io_wait_rsrc_data(ctx->file_data); + if (WARN_ON_ONCE(!list_empty(&ctx->rsrc_ref_list))) + return; mutex_lock(&ctx->uring_lock); if (ctx->buf_data) |