diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-12-19 12:30:43 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-12-19 12:33:50 -0700 |
| commit | a4104821ad651d8a0b374f0b2474c345bbb42f82 (patch) | |
| tree | 46fba3dddd88e21c0ffeb456a0dd0a5b02c61d24 /io_uring | |
| parent | c43203154d8ac579537aa0c7802b77d463b1f53a (diff) | |
| download | linux-a4104821ad651d8a0b374f0b2474c345bbb42f82.tar.gz | |
io_uring/unix: drop usage of io_uring socket
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>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/io_uring.c | 13 | ||||
| -rw-r--r-- | io_uring/io_uring.h | 1 |
2 files changed, 0 insertions, 14 deletions
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 2b24ce692b0b47..a9acccd45880d6 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -171,19 +171,6 @@ static struct ctl_table kernel_io_uring_disabled_table[] = { }; #endif -struct sock *io_uring_get_socket(struct file *file) -{ -#if defined(CONFIG_UNIX) - if (io_is_uring_fops(file)) { - struct io_ring_ctx *ctx = file->private_data; - - return ctx->ring_sock->sk; - } -#endif - return NULL; -} -EXPORT_SYMBOL(io_uring_get_socket); - static inline void io_submit_flush_completions(struct io_ring_ctx *ctx) { if (!wq_list_empty(&ctx->submit_state.compl_reqs) || diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h index 1112c198e516bb..04e33f25919ca7 100644 --- a/io_uring/io_uring.h +++ b/io_uring/io_uring.h @@ -44,7 +44,6 @@ struct file *io_file_get_fixed(struct io_kiocb *req, int fd, unsigned issue_flags); void __io_req_task_work_add(struct io_kiocb *req, unsigned flags); -bool io_is_uring_fops(struct file *file); bool io_alloc_async_data(struct io_kiocb *req); void io_req_task_queue(struct io_kiocb *req); void io_queue_iowq(struct io_kiocb *req, struct io_tw_state *ts_dont_use); |