diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-02 13:08:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-02 13:08:27 -0400 |
| commit | 26d147799001edfe479c0b015ba1cb038def5ae7 (patch) | |
| tree | d1d29b19cd4417e5399db7ae71410fa6a89556f7 | |
| parent | 921bdc72a0d68977092d6a64855a1b8967acc1d9 (diff) | |
| parent | 4ea0bf4b98d66a7a790abb285539f395596bae92 (diff) | |
Merge tag 'io_uring-6.4-2023-06-02' of git://git.kernel.dk/linux
Pull io_uring fix from Jens Axboe:
"Just a single revert in here, removing the warning on the epoll ctl
opcode.
We originally deprecated this a few releases ago, but I've since had
two people report that it's being used. Which isn't the biggest deal,
obviously this is why we out in the deprecation notice in the first
place, but it also means that we should just kill this warning again
and abandon the deprecation plans.
Since it's only a few handfuls of code to support epoll ctl, not worth
going any further with this imho"
* tag 'io_uring-6.4-2023-06-02' of git://git.kernel.dk/linux:
io_uring: undeprecate epoll_ctl support
| -rw-r--r-- | io_uring/epoll.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/io_uring/epoll.c b/io_uring/epoll.c index 9aa74d2c80bc..89bff2068a19 100644 --- a/io_uring/epoll.c +++ b/io_uring/epoll.c @@ -25,10 +25,6 @@ int io_epoll_ctl_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) { struct io_epoll *epoll = io_kiocb_to_cmd(req, struct io_epoll); - pr_warn_once("%s: epoll_ctl support in io_uring is deprecated and will " - "be removed in a future Linux kernel version.\n", - current->comm); - if (sqe->buf_index || sqe->splice_fd_in) return -EINVAL; |