diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-12-19 20:30:43 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-12-19 20:33:50 +0100 |
| commit | a4104821ad651d8a0b374f0b2474c345bbb42f82 (patch) | |
| tree | 46fba3dddd88e21c0ffeb456a0dd0a5b02c61d24 /net | |
| parent | io_uring/register: move io_uring_register(2) related code to register.c (diff) | |
| download | linux-a4104821ad651d8a0b374f0b2474c345bbb42f82.tar.xz linux-a4104821ad651d8a0b374f0b2474c345bbb42f82.zip | |
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 'net')
| -rw-r--r-- | net/core/scm.c | 2 | ||||
| -rw-r--r-- | net/unix/scm.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/net/core/scm.c b/net/core/scm.c index db3f7cd519c2..d0e0852a24d5 100644 --- a/net/core/scm.c +++ b/net/core/scm.c @@ -105,7 +105,7 @@ static int scm_fp_copy(struct cmsghdr *cmsg, struct scm_fp_list **fplp) if (fd < 0 || !(file = fget_raw(fd))) return -EBADF; /* don't allow io_uring files */ - if (io_uring_get_socket(file)) { + if (io_is_uring_fops(file)) { fput(file); return -EINVAL; } diff --git a/net/unix/scm.c b/net/unix/scm.c index 6ff628f2349f..822ce0d0d791 100644 --- a/net/unix/scm.c +++ b/net/unix/scm.c @@ -35,10 +35,8 @@ struct sock *unix_get_socket(struct file *filp) /* PF_UNIX ? */ if (s && ops && ops->family == PF_UNIX) u_sock = s; - } else { - /* Could be an io_uring instance */ - u_sock = io_uring_get_socket(filp); } + return u_sock; } EXPORT_SYMBOL(unix_get_socket); |