summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2025-02-20 17:59:38 +0300
committerJens Axboe <axboe@kernel.dk>2025-02-20 17:59:38 +0300
commit08b40b7a1051114f41cdec0bba4548b87cc2a3f6 (patch)
treef43fb5e8e238662f5f43829b98d941286ec207e9 /include/linux
parent9269919478c284d478da27dd0afa0e6126272cd9 (diff)
parent0511f4e6a16988e485a5e60727c89e2ca9f83f44 (diff)
downloadlinux-08b40b7a1051114f41cdec0bba4548b87cc2a3f6.tar.xz
Merge branch 'vfs-6.15.eventpoll' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs into for-6.15/io_uring-epoll-wait
Merge epoll changes from the VFS tree, which the io_uring changes depend on. * 'vfs-6.15.eventpoll' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs: eventpoll: add epoll_sendevents() helper eventpoll: abstract out ep_try_send_events() helper eventpoll: abstract out parameter sanity checking
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/eventpoll.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/eventpoll.h b/include/linux/eventpoll.h
index 0c0d00fcd131..ccb478eb174b 100644
--- a/include/linux/eventpoll.h
+++ b/include/linux/eventpoll.h
@@ -25,6 +25,10 @@ struct file *get_epoll_tfile_raw_ptr(struct file *file, int tfd, unsigned long t
/* Used to release the epoll bits inside the "struct file" */
void eventpoll_release_file(struct file *file);
+/* Copy ready events to userspace */
+int epoll_sendevents(struct file *file, struct epoll_event __user *events,
+ int maxevents);
+
/*
* This is called from inside fs/file_table.c:__fput() to unlink files
* from the eventpoll interface. We need to have this facility to cleanup