summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Begunkov <asml.silence@gmail.com>2022-06-16 13:57:18 +0100
committerJens Axboe <axboe@kernel.dk>2022-07-24 18:39:14 -0600
commit27a9d66fec77cff0e32d2ecd5d0ac7ef878a7bb0 (patch)
tree7998809e8e398f7e5007b440bd187f2123845506
parentb3659a65be70eb68d9fc9802c4ce81e0f943abfd (diff)
downloadlinux-stable-27a9d66fec77cff0e32d2ecd5d0ac7ef878a7bb0.tar.gz
linux-stable-27a9d66fec77cff0e32d2ecd5d0ac7ef878a7bb0.tar.bz2
linux-stable-27a9d66fec77cff0e32d2ecd5d0ac7ef878a7bb0.zip
io_uring: kill extra io_uring_types.h includes
io_uring/io_uring.h already includes io_uring_types.h, no need to include it every time. Kill it in a bunch of places, it prepares us for following patches. Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Link: https://lore.kernel.org/r/94d8c943fbe0ef949981c508ddcee7fc1c18850f.1655384063.git.asml.silence@gmail.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--io_uring/advise.c1
-rw-r--r--io_uring/cancel.c1
-rw-r--r--io_uring/epoll.c1
-rw-r--r--io_uring/fdinfo.c1
-rw-r--r--io_uring/filetable.c1
-rw-r--r--io_uring/fs.c1
-rw-r--r--io_uring/io_uring.c1
-rw-r--r--io_uring/kbuf.c1
-rw-r--r--io_uring/msg_ring.c1
-rw-r--r--io_uring/net.c1
-rw-r--r--io_uring/nop.c1
-rw-r--r--io_uring/opdef.c1
-rw-r--r--io_uring/openclose.c1
-rw-r--r--io_uring/poll.c1
-rw-r--r--io_uring/rsrc.c1
-rw-r--r--io_uring/rw.c1
-rw-r--r--io_uring/splice.c1
-rw-r--r--io_uring/sqpoll.c1
-rw-r--r--io_uring/statx.c1
-rw-r--r--io_uring/sync.c1
-rw-r--r--io_uring/tctx.c1
-rw-r--r--io_uring/timeout.c1
-rw-r--r--io_uring/uring_cmd.c1
-rw-r--r--io_uring/xattr.c1
24 files changed, 0 insertions, 24 deletions
diff --git a/io_uring/advise.c b/io_uring/advise.c
index 8870fdf66ffb..581956934c0b 100644
--- a/io_uring/advise.c
+++ b/io_uring/advise.c
@@ -11,7 +11,6 @@
#include <uapi/linux/fadvise.h>
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "advise.h"
diff --git a/io_uring/cancel.c b/io_uring/cancel.c
index f07bfd27c98a..d1e7f5a955ab 100644
--- a/io_uring/cancel.c
+++ b/io_uring/cancel.c
@@ -10,7 +10,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "tctx.h"
#include "poll.h"
diff --git a/io_uring/epoll.c b/io_uring/epoll.c
index 10853e8ed078..a8b794471d6b 100644
--- a/io_uring/epoll.c
+++ b/io_uring/epoll.c
@@ -9,7 +9,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "epoll.h"
diff --git a/io_uring/fdinfo.c b/io_uring/fdinfo.c
index 344e7d90d557..61c35707a6cf 100644
--- a/io_uring/fdinfo.c
+++ b/io_uring/fdinfo.c
@@ -9,7 +9,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "sqpoll.h"
#include "fdinfo.h"
diff --git a/io_uring/filetable.c b/io_uring/filetable.c
index e449ceb9a848..534e1a3c625d 100644
--- a/io_uring/filetable.c
+++ b/io_uring/filetable.c
@@ -9,7 +9,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "rsrc.h"
#include "filetable.h"
diff --git a/io_uring/fs.c b/io_uring/fs.c
index aac1bc5255b0..0de4f549bb7d 100644
--- a/io_uring/fs.c
+++ b/io_uring/fs.c
@@ -12,7 +12,6 @@
#include "../fs/internal.h"
-#include "io_uring_types.h"
#include "io_uring.h"
#include "fs.h"
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 0dbf6a74f9f3..0a1f83a936b7 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -80,7 +80,6 @@
#include "io-wq.h"
-#include "io_uring_types.h"
#include "io_uring.h"
#include "opdef.h"
#include "refs.h"
diff --git a/io_uring/kbuf.c b/io_uring/kbuf.c
index 59e4fafeb28c..62de0dda24bf 100644
--- a/io_uring/kbuf.c
+++ b/io_uring/kbuf.c
@@ -11,7 +11,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "opdef.h"
#include "kbuf.h"
diff --git a/io_uring/msg_ring.c b/io_uring/msg_ring.c
index 7c3c5f3ab06b..b02be2349652 100644
--- a/io_uring/msg_ring.c
+++ b/io_uring/msg_ring.c
@@ -7,7 +7,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "msg_ring.h"
diff --git a/io_uring/net.c b/io_uring/net.c
index 35d0183fe758..b77bfbfb0816 100644
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -10,7 +10,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "kbuf.h"
#include "net.h"
diff --git a/io_uring/nop.c b/io_uring/nop.c
index d363d8ce70a3..d956599a3c1b 100644
--- a/io_uring/nop.c
+++ b/io_uring/nop.c
@@ -7,7 +7,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "nop.h"
diff --git a/io_uring/opdef.c b/io_uring/opdef.c
index d687d33f9c0c..a7b84b43e6c2 100644
--- a/io_uring/opdef.c
+++ b/io_uring/opdef.c
@@ -8,7 +8,6 @@
#include <linux/file.h>
#include <linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "opdef.h"
#include "refs.h"
diff --git a/io_uring/openclose.c b/io_uring/openclose.c
index 1cbf39030970..099a5ec84dfd 100644
--- a/io_uring/openclose.c
+++ b/io_uring/openclose.c
@@ -12,7 +12,6 @@
#include "../fs/internal.h"
-#include "io_uring_types.h"
#include "io_uring.h"
#include "rsrc.h"
#include "openclose.h"
diff --git a/io_uring/poll.c b/io_uring/poll.c
index e0c181fe6264..63aca920543b 100644
--- a/io_uring/poll.c
+++ b/io_uring/poll.c
@@ -13,7 +13,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "refs.h"
#include "opdef.h"
diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c
index 7fed3105152a..68629eba4132 100644
--- a/io_uring/rsrc.c
+++ b/io_uring/rsrc.c
@@ -12,7 +12,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "openclose.h"
#include "rsrc.h"
diff --git a/io_uring/rw.c b/io_uring/rw.c
index e5ca23d0783e..f8b42f2265df 100644
--- a/io_uring/rw.c
+++ b/io_uring/rw.c
@@ -14,7 +14,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "opdef.h"
#include "kbuf.h"
diff --git a/io_uring/splice.c b/io_uring/splice.c
index 0e19d6330345..b013ba34bffa 100644
--- a/io_uring/splice.c
+++ b/io_uring/splice.c
@@ -11,7 +11,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "splice.h"
diff --git a/io_uring/sqpoll.c b/io_uring/sqpoll.c
index 149d5c976f14..76d4d70c733a 100644
--- a/io_uring/sqpoll.c
+++ b/io_uring/sqpoll.c
@@ -14,7 +14,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "sqpoll.h"
diff --git a/io_uring/statx.c b/io_uring/statx.c
index 83b15687e9c5..6056cd7f4876 100644
--- a/io_uring/statx.c
+++ b/io_uring/statx.c
@@ -8,7 +8,6 @@
#include "../fs/internal.h"
-#include "io_uring_types.h"
#include "io_uring.h"
#include "statx.h"
diff --git a/io_uring/sync.c b/io_uring/sync.c
index 9ee8ff865521..f2102afa79ca 100644
--- a/io_uring/sync.c
+++ b/io_uring/sync.c
@@ -11,7 +11,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "sync.h"
diff --git a/io_uring/tctx.c b/io_uring/tctx.c
index a819da8fc85c..9b30fb0d3603 100644
--- a/io_uring/tctx.c
+++ b/io_uring/tctx.c
@@ -9,7 +9,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "tctx.h"
diff --git a/io_uring/timeout.c b/io_uring/timeout.c
index 526fc8b2e3b6..f9df359813c9 100644
--- a/io_uring/timeout.c
+++ b/io_uring/timeout.c
@@ -8,7 +8,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "refs.h"
#include "cancel.h"
diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c
index abf78918a099..0a421ed51e7e 100644
--- a/io_uring/uring_cmd.c
+++ b/io_uring/uring_cmd.c
@@ -6,7 +6,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "uring_cmd.h"
diff --git a/io_uring/xattr.c b/io_uring/xattr.c
index 79adf4efba01..b179f9acd5ac 100644
--- a/io_uring/xattr.c
+++ b/io_uring/xattr.c
@@ -13,7 +13,6 @@
#include "../fs/internal.h"
-#include "io_uring_types.h"
#include "io_uring.h"
#include "xattr.h"