github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 17:47:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

eventpoll: rename struct epoll_filefd to epoll_key

Browse Source 
This more accurately describes what purpose this structure serves, as
a lookup key.

Suggested-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Link: https://patch.msgid.link/20260514140817.623026-5-axboe@kernel.dk
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Jens Axboe 2026-05-14 08:07:20 -06:00 committed by Christian Brauner
parent 0995baf261
commit 463aba8090
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/eventpoll.c
View File

@ -141,7 +141,7 @@ struct epitem {
struct epitem *next;
/* The file descriptor information this item refers to */
struct epoll_filefd ffd;
struct epoll_key ffd;
/* List containing poll wait queues */
struct eppoll_entry *pwqlist;
@ -335,8 +335,7 @@ int is_file_epoll(struct file *f)
}
/* Compare RB tree keys */
static inline int ep_cmp_ffd(struct epoll_filefd *p1,
struct epoll_filefd *p2)
static inline int ep_cmp_ffd(struct epoll_key *p1, struct epoll_key *p2)
{
return (p1->file > p2->file ? +1:
(p1->file < p2->file ? -1 : p1->fd - p2->fd));
@ -1160,7 +1159,7 @@ static int ep_alloc(struct eventpoll **pep)
* are protected by the "mtx" mutex, and ep_find() must be called with
* "mtx" held.
*/
static struct epitem *ep_find(struct eventpoll *ep, struct epoll_filefd *tf)
static struct epitem *ep_find(struct eventpoll *ep, struct epoll_key *tf)
{
int kcmp;
struct rb_node *rbp;
@ -1549,7 +1548,7 @@ static int attach_epitem(struct file *file, struct epitem *epi)
* Must be called with "mtx" held.
*/
static int ep_insert(struct eventpoll *ep, const struct epoll_event *event,
struct epoll_filefd *tf, int full_check)
struct epoll_key *tf, int full_check)
{
int error, pwake = 0;
__poll_t revents;
@ -2220,7 +2219,7 @@ static inline int epoll_mutex_lock(struct mutex *mutex, int depth,
return -EAGAIN;
}
int do_epoll_ctl_file(struct file *f, int op, struct epoll_filefd *tf,
int do_epoll_ctl_file(struct file *f, int op, struct epoll_key *tf,
struct epoll_event *epds, bool nonblock)
{
int error;
@ -2357,7 +2356,7 @@ int do_epoll_ctl_file(struct file *f, int op, struct epoll_filefd *tf,
int do_epoll_ctl(int epfd, int op, int fd, struct epoll_event *epds,
bool nonblock)
{
struct epoll_filefd efd;
struct epoll_key efd;
CLASS(fd, f)(epfd);
if (fd_empty(f))

4
include/linux/eventpoll.h
View File

@ -61,12 +61,12 @@ static inline void eventpoll_release(struct file *file)
eventpoll_release_file(file);
}
struct epoll_filefd {
struct epoll_key {
struct file *file;
int fd;
} __packed;
int do_epoll_ctl_file(struct file *f, int op, struct epoll_filefd *tf,
int do_epoll_ctl_file(struct file *f, int op, struct epoll_key *tf,
struct epoll_event *epds, bool nonblock);
int do_epoll_ctl(int epfd, int op, int fd, struct epoll_event *epds,
bool nonblock);