diff options
| author | Jens Axboe <axboe@kernel.dk> | 2026-05-14 17:07:20 +0300 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2026-05-15 18:34:26 +0300 |
| commit | 463aba8090738bcd956297f7341b6874e76ae664 (patch) | |
| tree | ab53c6b02c49093c2bb9f237f543558a2439c23d | |
| parent | 0995baf261ce8fc141768911d97ba76e854e26cf (diff) | |
| download | linux-463aba8090738bcd956297f7341b6874e76ae664.tar.xz | |
eventpoll: rename struct epoll_filefd to epoll_key
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>
| -rw-r--r-- | fs/eventpoll.c | 13 | ||||
| -rw-r--r-- | include/linux/eventpoll.h | 4 |
2 files changed, 8 insertions, 9 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 1c7001866340..7535b10f8c6a 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -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 @@ allocate: * 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 @@ error_tgt_fput: 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)) diff --git a/include/linux/eventpoll.h b/include/linux/eventpoll.h index 4a6fe989810b..c214c374fefc 100644 --- a/include/linux/eventpoll.h +++ b/include/linux/eventpoll.h @@ -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); |