io_uring: don't include filetable.h in io_uring.h

io_uring/io_uring.h doesn't use anything declared in
io_uring/filetable.h, so drop the unnecessary #include. Add filetable.h
includes in .c files previously relying on the transitive include from
io_uring.h.

Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/io_uring/cancel.c b/io_uring/cancel.c
index 6d57602304df81334f011864efce3c9c8431aadd..64b51e82baa245512f11d5cdc51b9e6a1a51bcca 100644 (file)
--- a/io_uring/cancel.c
+++ b/io_uring/cancel.c
@@ -11,6 +11,7 @@
 
 #include <uapi/linux/io_uring.h>
 
+#include "filetable.h"
 #include "io_uring.h"
 #include "tctx.h"
 #include "poll.h"

diff --git a/io_uring/fdinfo.c b/io_uring/fdinfo.c
index 5c733983876905cdb7527ac3266bdde0cfc94edc..ff3364531c77be0925903671c373f521ecb1ab38 100644 (file)
--- a/io_uring/fdinfo.c
+++ b/io_uring/fdinfo.c
@@ -9,7 +9,7 @@
 
 #include <uapi/linux/io_uring.h>
 
-#include "io_uring.h"
+#include "filetable.h"
 #include "sqpoll.h"
 #include "fdinfo.h"
 #include "cancel.h"

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 252a0021cd437772e2689928fb9acf13e1c6fa8e..3474038624875c93e30d46e42165679b93985fe6 100644 (file)
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -79,6 +79,7 @@
 
 #include "io-wq.h"
 
+#include "filetable.h"
 #include "io_uring.h"
 #include "opdef.h"
 #include "refs.h"

diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h
index a1d8d69411ff51d286738322ff52dfa3149ecba1..e92099d8fcb7f4cbd9b2068c7824f6635f470ffe 100644 (file)
--- a/io_uring/io_uring.h
+++ b/io_uring/io_uring.h
@@ -11,7 +11,6 @@
 #include "alloc_cache.h"
 #include "io-wq.h"
 #include "slist.h"
-#include "filetable.h"
 #include "opdef.h"
 
 #ifndef CREATE_TRACE_POINTS

diff --git a/io_uring/net.c b/io_uring/net.c
index 226fea2312b5877f42bfa7dd965c4b76bd61b46d..f99b90c762fc2fcca910c1eac683a62aedbf5389 100644 (file)
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -10,6 +10,7 @@
 
 #include <uapi/linux/io_uring.h>
 
+#include "filetable.h"
 #include "io_uring.h"
 #include "kbuf.h"
 #include "alloc_cache.h"

diff --git a/io_uring/openclose.c b/io_uring/openclose.c
index d70700e5cef88d57322e5a3f5f5c0d9f955f75bb..bfeb91b31bba5153d45e159858f9cf72223ed178 100644 (file)
--- a/io_uring/openclose.c
+++ b/io_uring/openclose.c
@@ -14,6 +14,7 @@
 
 #include "../fs/internal.h"
 
+#include "filetable.h"
 #include "io_uring.h"
 #include "rsrc.h"
 #include "openclose.h"

diff --git a/io_uring/register.c b/io_uring/register.c
index f4c76db276836b5fed5664de40e1065ff8fbe795..96e9cac12823ae35b425c9bc09543536aa9f7a75 100644 (file)
--- a/io_uring/register.c
+++ b/io_uring/register.c
@@ -18,6 +18,7 @@
 #include <linux/io_uring.h>
 #include <linux/io_uring_types.h>
 
+#include "filetable.h"
 #include "io_uring.h"
 #include "opdef.h"
 #include "tctx.h"

diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c
index f75f5e43fa4aad7ceefd27a25e25ba989e1edd7c..2d15b8785a95aeab02731a5c8f1a9d2b822b3671 100644 (file)
--- a/io_uring/rsrc.c
+++ b/io_uring/rsrc.c
@@ -13,6 +13,7 @@
 
 #include <uapi/linux/io_uring.h>
 
+#include "filetable.h"
 #include "io_uring.h"
 #include "openclose.h"
 #include "rsrc.h"

diff --git a/io_uring/rw.c b/io_uring/rw.c
index dcde5bb7421a828af1399ffb1f6d0383f1ffce95..ab6b4afccec3812fdd851dfebc0eea5641ec4f60 100644 (file)
--- a/io_uring/rw.c
+++ b/io_uring/rw.c
@@ -15,6 +15,7 @@
 
 #include <uapi/linux/io_uring.h>
 
+#include "filetable.h"
 #include "io_uring.h"
 #include "opdef.h"
 #include "kbuf.h"

diff --git a/io_uring/splice.c b/io_uring/splice.c
index 35ce4e60b495987ab1455a21bea42076a88343a8..e81ebbb91925d3f302c3d86db94cd1b39bc813fd 100644 (file)
--- a/io_uring/splice.c
+++ b/io_uring/splice.c
@@ -11,6 +11,7 @@
 
 #include <uapi/linux/io_uring.h>
 
+#include "filetable.h"
 #include "io_uring.h"
 #include "splice.h"