diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-23 12:42:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-23 12:42:33 -0700 |
| commit | 368da430d04dbe31aded44e5f5c255ff0899ad1d (patch) | |
| tree | 0a66b646d202e5daf31b1fca031bcec17e40a192 /include/linux/socket.h | |
| parent | 09beaff75e4c4cee590b0e547c7587ff6cadb5db (diff) | |
| parent | 033b87d24f7257c45506bd043ad85ed24a9925e2 (diff) | |
| download | linux-368da430d04dbe31aded44e5f5c255ff0899ad1d.tar.gz linux-368da430d04dbe31aded44e5f5c255ff0899ad1d.tar.bz2 linux-368da430d04dbe31aded44e5f5c255ff0899ad1d.zip | |
Merge tag 'for-5.19/io_uring-socket-2022-05-22' of git://git.kernel.dk/linux-block
Pull io_uring socket() support from Jens Axboe:
"This adds support for socket(2) for io_uring. This is handy when using
direct / registered file descriptors with io_uring.
Outside of those two patches, a small series from Dylan on top that
improves the tracing by providing a text representation of the opcode
rather than needing to decode this by reading the header file every
time.
That sits in this branch as it was the last opcode added (until it
wasn't...)"
* tag 'for-5.19/io_uring-socket-2022-05-22' of git://git.kernel.dk/linux-block:
io_uring: use the text representation of ops in trace
io_uring: rename op -> opcode
io_uring: add io_uring_get_opcode
io_uring: add type to op enum
io_uring: add socket(2) support
net: add __sys_socket_file()
Diffstat (limited to 'include/linux/socket.h')
| -rw-r--r-- | include/linux/socket.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h index 6f85f5d957ef..a1882e1e71d2 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -434,6 +434,7 @@ extern struct file *do_accept(struct file *file, unsigned file_flags, extern int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr, int __user *upeer_addrlen, int flags); extern int __sys_socket(int family, int type, int protocol); +extern struct file *__sys_socket_file(int family, int type, int protocol); extern int __sys_bind(int fd, struct sockaddr __user *umyaddr, int addrlen); extern int __sys_connect_file(struct file *file, struct sockaddr_storage *addr, int addrlen, int file_flags); |