diff options
| author | Jens Axboe <axboe@kernel.dk> | 2020-02-10 09:07:05 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-03-02 14:06:34 -0700 |
| commit | c2f2eb7d2c1cdc37fa9633bae96f381d33ee7a14 (patch) | |
| tree | 0ed460c061ef7bc1b9206bd9ed8daa3c9fa24e41 /fs/io_uring.c | |
| parent | 6fb614920b38bbf3c1c7fcd944c6d9b5d746103d (diff) | |
| download | lwn-c2f2eb7d2c1cdc37fa9633bae96f381d33ee7a14.tar.gz lwn-c2f2eb7d2c1cdc37fa9633bae96f381d33ee7a14.zip | |
io_uring: store io_kiocb in wait->private
Store the io_kiocb in the private field instead of the poll entry, this
is in preparation for allowing multiple waitqueues.
No functional changes in this patch.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/io_uring.c')
| -rw-r--r-- | fs/io_uring.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index f999503854b7..7a97a6c1c09e 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -3730,8 +3730,8 @@ static void io_poll_trigger_evfd(struct io_wq_work **workptr) static int io_poll_wake(struct wait_queue_entry *wait, unsigned mode, int sync, void *key) { - struct io_poll_iocb *poll = wait->private; - struct io_kiocb *req = container_of(poll, struct io_kiocb, poll); + struct io_kiocb *req = wait->private; + struct io_poll_iocb *poll = &req->poll; struct io_ring_ctx *ctx = req->ctx; __poll_t mask = key_to_poll(key); @@ -3854,7 +3854,7 @@ static int io_poll_add(struct io_kiocb *req, struct io_kiocb **nxt) /* initialized the list so that we can do list_empty checks */ INIT_LIST_HEAD(&poll->wait.entry); init_waitqueue_func_entry(&poll->wait, io_poll_wake); - poll->wait.private = poll; + poll->wait.private = req; INIT_LIST_HEAD(&req->list); |