From: Jens Axboe Date: Sat, 7 May 2022 16:08:31 +0000 (-0600) Subject: io_uring: allow allocated fixed files for accept X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c30c3e00cbd96f0cce478efba41dbe78dad8c774;p=linux.git io_uring: allow allocated fixed files for accept If the application passes in IORING_FILE_INDEX_ALLOC as the file_slot, then that's a hint to allocate a fixed file descriptor rather than have one be passed in directly. This can be useful for having io_uring manage the direct descriptor space, and also allows multi-shot support to work with fixed files. Normal accept direct requests will complete with 0 for success, and < 0 in case of error. If io_uring is asked to allocated the direct descriptor, then the direct descriptor is returned in case of success. Reviewed-by: Hao Xu Signed-off-by: Jens Axboe --- diff --git a/fs/io_uring.c b/fs/io_uring.c index f448264a10676..dc75c43bc9b22 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -5805,8 +5805,8 @@ static int io_accept(struct io_kiocb *req, unsigned int issue_flags) fd_install(fd, file); ret = fd; } else { - ret = io_install_fixed_file(req, file, issue_flags, - accept->file_slot - 1); + ret = io_fixed_fd_install(req, issue_flags, file, + accept->file_slot); } __io_req_complete(req, issue_flags, ret, 0); return 0;