io_uring: wire up allocated direct descriptors for socket
Jens Axboe
maintainerPATCH 1/1 io_uring: wire up allocated direct descriptors for socket
The socket support was merged in an earlier branch that didn't yet have support for allocating direct descriptors, hence only open and accept got support for that.
Do the one-liner to enable it now, so we have consistent support for any request that can instantiate a file/direct descriptor.
Signed-off-by Jens Axboe <[email protected]>
---
fs/io_uring.c +2 -2
@@ -6676,8 +6676,8 @@ static int io_socket(struct io_kiocb *req, unsigned int issue_flags)fd_install (fd, file); ret = fd; }else { - ret =io_install_fixed_file (req, file, issue_flags, - sock->file_slot -1 ); + ret =io_fixed_fd_install (req, issue_flags, file, + sock->file_slot); }__io_req_complete (req, issue_flags, ret,0 );return 0 ;
Signature · 1 line
Jens Axboe
Quoted 17 lines · Jens Axboe
The socket support was merged in an earlier branch that didn't yet have support for allocating direct descriptors, hence only open and accept got support for that.
Do the one-liner to enable it now, so we have consistent support for any request that can instantiate a file/direct descriptor.
Signed-off-by Jens Axboe <[email protected]>---
fs/io_uring.c +0
-0
fs/io_uring.c static int io_socket(struct io_kiocb *req, unsigned int issue_flags) · line 6683
Quoted 10 lines
fs/io_uring.c +2
-2@@ -6676,8 +6676,8 @@ static int io_socket(struct io_kiocb *req, unsigned int issue_flags)fd_install (fd, file); ret = fd; }else { - ret =io_install_fixed_file (req, file, issue_flags, - sock->file_slot -1 ); + ret =io_fixed_fd_install (req, issue_flags, file, + sock->file_slot); }__io_req_complete (req, issue_flags, ret,0 );return 0 ;
Reviewed-by Hao Xu <[email protected]>