io_uring/rsrc: move struct io_fixed_file to rsrc.h header

There's no need for this internal structure to be visible, move it to
the private rsrc.h header instead.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/include/linux/io_uring_types.h b/include/linux/io_uring_types.h
index 2f12828b22a41b3a9bf85f8ff35264ef14726162..d4ba4ae480d6b21ba01c59ee9f7f01d389bb0d20 100644 (file)
--- a/include/linux/io_uring_types.h
+++ b/include/linux/io_uring_types.h
@@ -55,11 +55,6 @@ struct io_wq_work {
        int cancel_seq;
 };
 
-struct io_fixed_file {
-       /* file * with additional FFS_* flags */
-       unsigned long file_ptr;
-};
-
 struct io_file_table {
        struct io_fixed_file *files;
        unsigned long *bitmap;

diff --git a/io_uring/filetable.h b/io_uring/filetable.h
index b2435c4dca1f9fd24ddadf3396edbf0d146eea96..c027ed4ad68d568c4c237c9cd00dbbac45bf2df5 100644 (file)
--- a/io_uring/filetable.h
+++ b/io_uring/filetable.h
@@ -4,6 +4,7 @@
 
 #include <linux/file.h>
 #include <linux/io_uring_types.h>
+#include "rsrc.h"
 
 bool io_alloc_file_tables(struct io_file_table *table, unsigned nr_files);
 void io_free_file_tables(struct io_file_table *table);

diff --git a/io_uring/rsrc.h b/io_uring/rsrc.h
index c50d4be4aa6dc0a267e05420c907f514ced53b42..e072fb3ee35100208302d4b243545e899465189f 100644 (file)
--- a/io_uring/rsrc.h
+++ b/io_uring/rsrc.h
@@ -40,6 +40,11 @@ struct io_rsrc_node {
        struct io_rsrc_put              item;
 };
 
+struct io_fixed_file {
+       /* file * with additional FFS_* flags */
+       unsigned long file_ptr;
+};
+
 struct io_mapped_ubuf {
        u64             ubuf;
        unsigned int    len;