io_uring: move timeout locking in io_timeout_cancel()
authorPavel Begunkov <asml.silence@gmail.com>
Wed, 20 Apr 2022 12:40:54 +0000 (13:40 +0100)
committerJens Axboe <axboe@kernel.dk>
Mon, 25 Apr 2022 00:18:17 +0000 (18:18 -0600)
commit3645c2000a7694022c39c545676c12fb9190855a
tree93d48c5a49a8803a7f3bfd9719e3c8d78fdcf95b
parent5e45690a1cb8cb591ccf4a517cdd6ad6cb369ac4
io_uring: move timeout locking in io_timeout_cancel()

Move ->timeout_lock grabbing inside of io_timeout_cancel(), so
we can do io_req_task_queue_fail() outside of the lock. It's much nicer
than relying on triple nested locking.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/cde758c2897930d31e205ed8f476d4ec879a8849.1650458197.git.asml.silence@gmail.com
[axboe: drop now wrong timeout_lock annotation]
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/io_uring.c