diff options
| author | Jens Axboe <axboe@kernel.dk> | 2022-05-07 10:08:31 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-05-13 06:28:43 -0600 |
| commit | c30c3e00cbd96f0cce478efba41dbe78dad8c774 (patch) | |
| tree | a0df1421104f5039d0cb85271e11ad2f4407409b /fs/io_uring.c | |
| parent | 1339f24b336db5ded9811f3fe7b948e0de207785 (diff) | |
| download | linux-stable-c30c3e00cbd96f0cce478efba41dbe78dad8c774.tar.gz linux-stable-c30c3e00cbd96f0cce478efba41dbe78dad8c774.tar.bz2 linux-stable-c30c3e00cbd96f0cce478efba41dbe78dad8c774.zip | |
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 <howeyxu@tencent.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/io_uring.c')
| -rw-r--r-- | fs/io_uring.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index f448264a1067..dc75c43bc9b2 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; |