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>

diff --git a/io_uring/advise.c b/io_uring/advise.c
index 8870fdf66ffbbdeec6dfecd89db9253d5899fe63..581956934c0bf0c96f83c9fa6df2c76c2916883f 100644 (file)
--- 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 f07bfd27c98ac2f7813d6e44b63119152f144d48..d1e7f5a955ab20f16704743ee44d41be80c01b0b 100644 (file)
--- 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 10853e8ed0788751d1031dc7d7ecdb45d8018cdf..a8b794471d6b833bbbc67892b3c5e4d8fc1be3fe 100644 (file)
--- 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 344e7d90d55756d19c07130aed20c3a7581d6eb6..61c35707a6cfc2b5d2be00e55c83c0d7c261ffe6 100644 (file)
--- 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 e449ceb9a848e6c1626a9cecb065de5859bb24c4..534e1a3c625d9f8c1c2660dda83a6b2d25159aa1 100644 (file)
--- 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 aac1bc5255b07fa3bbfc3c22f511c7ecc92eb68a..0de4f549bb7df635c0534762226da7ae369c13c7 100644 (file)
--- 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 0dbf6a74f9f3a1b3e7638c41916f5c2433ef97c8..0a1f83a936b753c88e2874c4dbb51dfd823829b2 100644 (file)
--- 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 59e4fafeb28ce4e58e1dd7a6418d6b76251f7350..62de0dda24bf6e95190bf42f977833b79bb2a719 100644 (file)
--- 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 7c3c5f3ab06b5728902ffe565e64761e4339efbc..b02be23496521ce85809ddf740c52365059e3a26 100644 (file)
--- 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 35d0183fe75817c9a2250f8ce9e3f84115d50100..b77bfbfb081673d47483e14c33f2ea218de9add3 100644 (file)
--- 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 d363d8ce70a3b7376ec586b45d3615cf584b79a5..d956599a3c1b8f413aab536a3815fc909af523ee 100644 (file)
--- 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 d687d33f9c0c033c3157f2c9511238ee2d0f9c1f..a7b84b43e6c235fbd4be7131f01cb4f7eccc0a4e 100644 (file)
--- 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 1cbf3903097053f96d91bf76af48493462b2a7cf..099a5ec84dfdb72ffb69c1932a65b4c8c51a4671 100644 (file)
--- 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 e0c181fe6264c0fe8f55ec092301c0999b382520..63aca920543b31c94b902085f15c0b00834f7ebd 100644 (file)
--- 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 7fed3105152a95bce28bbe872541fcbaedcd96be..68629eba4132650fb5bebda7986928e3295abd1d 100644 (file)
--- 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 e5ca23d0783e2c4ef863084acfeab72b41b25a74..f8b42f2265df987dc8c6aa5618066c49b8fd758f 100644 (file)
--- 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 0e19d63303452a3470dd334b28d2883257e58002..b013ba34bffa587f0f853cd7b11a05b6b69c540e 100644 (file)
--- 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 149d5c976f1467ee663744fc2bc7de1d3fb1c5f1..76d4d70c733a991424b235003e0faf9fef993bb0 100644 (file)
--- 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 83b15687e9c5eec0b056b9cdefeca4cd635fdfa5..6056cd7f48761c7e10f2d7cfbe6b60002f81d020 100644 (file)
--- 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 9ee8ff865521f394c1321cdc8a5c6cf9d94b3712..f2102afa79ca63d5cbb9649beed6579c3eec680a 100644 (file)
--- 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 a819da8fc85cd216bca034e0387c138c0b75f679..9b30fb0d360307c037897ccf62f7fe39ff84a44d 100644 (file)
--- 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 526fc8b2e3b65deb3ca9b98664b850e94c0966ae..f9df359813c93ea507e739f4628d5c2398dc534e 100644 (file)
--- 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 abf78918a0995f8329ab1ed6850ff41c0712af4a..0a421ed51e7e168c1258efe3de46a4b084fa2b2f 100644 (file)
--- 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 79adf4efba01845595891cb94aca2a9fb9a4f339..b179f9acd5acc5b2ad9cec0485a7d517d0b921a8 100644 (file)
--- 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"