io_uring: don't punt files update to io-wq unconditionally
Jens Axboe
maintainerPATCH 1/1 io_uring: don't punt files update to io-wq unconditionally
There's no reason to punt it unconditionally, we just need to ensure that the submit lock grabbing is conditional.
Fixes 05f3fb3c5397 ("io_uring: avoid ring quiesce for fixed file set unregister and update")
Signed-off-by Jens Axboe <[email protected]>
---
fs/io_uring.c +2 -5
@@ -6304,19 +6304,16 @@ static int io_files_update(struct io_kiocb *req, unsigned int issue_flags)struct io_uring_rsrc_update2 up;int ret; -if (issue_flags &IO_URING_F_NONBLOCK ) -return -EAGAIN ; - up.offset = req->rsrc_update.offset; up.data = req->rsrc_update.arg; up.nr =0 ; up.tags =0 ; up.resv =0 ; -mutex_lock (&ctx->uring_lock); +io_ring_submit_lock (ctx, !(issue_flags &IO_URING_F_NONBLOCK )); ret =__io_register_rsrc_update (ctx,IORING_RSRC_FILE , &up, req->rsrc_update.nr_args); -mutex_unlock (&ctx->uring_lock); +io_ring_submit_lock (ctx, !(issue_flags &IO_URING_F_NONBLOCK ));if (ret <0 )req_set_fail (req);
Signature · 1 line
Jens Axboe