summaryrefslogtreecommitdiff
path: root/io_uring
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2023-05-06 12:55:02 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-06-09 11:34:23 +0300
commit6fb0b098f6905a9e4bcf37516773d04e98de6b17 (patch)
treea98df7f7f7c0d5e86ba88d9c26e4892853a53bdb /io_uring
parent94f97b8df0058afae7dc00c3dafeffd442bf0048 (diff)
downloadlinux-6fb0b098f6905a9e4bcf37516773d04e98de6b17.tar.xz
io_uring: undeprecate epoll_ctl support
commit 4ea0bf4b98d66a7a790abb285539f395596bae92 upstream. Libuv recently started using it so there is at least one consumer now. Cc: stable@vger.kernel.org Fixes: 61a2732af4b0 ("io_uring: deprecate epoll_ctl support") Link: https://github.com/libuv/libuv/pull/3979 Signed-off-by: Ben Noordhuis <info@bnoordhuis.nl> Link: https://lore.kernel.org/r/20230506095502.13401-1-info@bnoordhuis.nl Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'io_uring')
-rw-r--r--io_uring/epoll.c4
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;