summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2020-09-18 20:41:00 -0600
committerJens Axboe <axboe@kernel.dk>2020-09-30 20:32:33 -0600
commita3ec60054082ca2c2145ba487f9fc4de904e2b03 (patch)
tree0e08bc6921f35bc8cce5da04cad3343b685f1d95
parent9b8284921513fc1ea57d87777283a59b05862f03 (diff)
io_uring: move io_uring_get_socket() into io_uring.h
Now we have a io_uring kernel header, move this definition out of fs.h and into io_uring.h where it belongs. Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--include/linux/fs.h9
-rw-r--r--include/linux/io_uring.h5
-rw-r--r--net/unix/scm.c1
3 files changed, 6 insertions, 9 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 7519ae003a08..1c4068428461 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -3514,15 +3514,6 @@ extern int vfs_fadvise(struct file *file, loff_t offset, loff_t len,
extern int generic_fadvise(struct file *file, loff_t offset, loff_t len,
int advice);
-#if defined(CONFIG_IO_URING)
-extern struct sock *io_uring_get_socket(struct file *file);
-#else
-static inline struct sock *io_uring_get_socket(struct file *file)
-{
- return NULL;
-}
-#endif
-
int vfs_ioc_setflags_prepare(struct inode *inode, unsigned int oldflags,
unsigned int flags);
diff --git a/include/linux/io_uring.h b/include/linux/io_uring.h
index c09135a1ef13..96315cfaf6d1 100644
--- a/include/linux/io_uring.h
+++ b/include/linux/io_uring.h
@@ -19,6 +19,7 @@ struct io_uring_task {
};
#if defined(CONFIG_IO_URING)
+struct sock *io_uring_get_socket(struct file *file);
void __io_uring_task_cancel(void);
void __io_uring_files_cancel(struct files_struct *files);
void __io_uring_free(struct task_struct *tsk);
@@ -39,6 +40,10 @@ static inline void io_uring_free(struct task_struct *tsk)
__io_uring_free(tsk);
}
#else
+static inline struct sock *io_uring_get_socket(struct file *file)
+{
+ return NULL;
+}
static inline void io_uring_task_cancel(void)
{
}
diff --git a/net/unix/scm.c b/net/unix/scm.c
index 8c40f2b32392..052ae709ce28 100644
--- a/net/unix/scm.c
+++ b/net/unix/scm.c
@@ -8,6 +8,7 @@
#include <net/af_unix.h>
#include <net/scm.h>
#include <linux/init.h>
+#include <linux/io_uring.h>
#include "scm.h"