diff options
| author | Jens Axboe <axboe@kernel.dk> | 2024-03-14 02:54:49 +0300 |
|---|---|---|
| committer | Sasha Levin <sashal@kernel.org> | 2024-03-27 01:21:45 +0300 |
| commit | 875f5fed30a182675f729f35bbd6ad62b52bd1ac (patch) | |
| tree | e458c45d243f7f2cc86c6a56f7ce8bcf0e1fb648 /include/linux | |
| parent | d35f38551c217d32daa0b7f5008adf1d21226042 (diff) | |
| download | linux-875f5fed30a182675f729f35bbd6ad62b52bd1ac.tar.xz | |
io_uring/unix: drop usage of io_uring socket
Commit a4104821ad651d8a0b374f0b2474c345bbb42f82 upstream.
Since we no longer allow sending io_uring fds over SCM_RIGHTS, move to
using io_is_uring_fops() to detect whether this is a io_uring fd or not.
With that done, kill off io_uring_get_socket() as nobody calls it
anymore.
This is in preparation to yanking out the rest of the core related to
unix gc with io_uring.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/io_uring.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/io_uring.h b/include/linux/io_uring.h index 649a4d7c241b..55d09f594cd1 100644 --- a/include/linux/io_uring.h +++ b/include/linux/io_uring.h @@ -6,9 +6,9 @@ #include <linux/xarray.h> #if defined(CONFIG_IO_URING) -struct sock *io_uring_get_socket(struct file *file); void __io_uring_cancel(bool cancel_all); void __io_uring_free(struct task_struct *tsk); +bool io_is_uring_fops(struct file *file); static inline void io_uring_files_cancel(void) { @@ -26,10 +26,6 @@ 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) { } @@ -39,6 +35,10 @@ static inline void io_uring_files_cancel(void) static inline void io_uring_free(struct task_struct *tsk) { } +static inline bool io_is_uring_fops(struct file *file) +{ + return false; +} #endif #endif |