summaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2022-06-23 22:33:24 +0300
committerJakub Kicinski <kuba@kernel.org>2022-06-23 22:33:24 +0300
commit93817be8b62c7fa1f1bdc3e8c037a73a60026be9 (patch)
tree873c207abc783edb4ead73b2b3a8a9b105f94420 /include/uapi
parentccb9bc1dfa444e3541622ccfff135e83d2a569d1 (diff)
parent399bd66e219e331976fe6fa6ab81a023c0c97870 (diff)
downloadlinux-93817be8b62c7fa1f1bdc3e8c037a73a60026be9.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/io_uring.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h
index 776e0278f9dd..53e7dae92e42 100644
--- a/include/uapi/linux/io_uring.h
+++ b/include/uapi/linux/io_uring.h
@@ -47,7 +47,6 @@ struct io_uring_sqe {
__u32 unlink_flags;
__u32 hardlink_flags;
__u32 xattr_flags;
- __u32 close_flags;
};
__u64 user_data; /* data to be passed back at completion time */
/* pack this to avoid bogus arm OABI complaints */
@@ -260,11 +259,6 @@ enum io_uring_op {
#define IORING_ACCEPT_MULTISHOT (1U << 0)
/*
- * close flags, store in sqe->close_flags
- */
-#define IORING_CLOSE_FD_AND_FILE_SLOT (1U << 0)
-
-/*
* IO completion data structure (Completion Queue Entry)
*/
struct io_uring_cqe {