diff options
| author | Keith Busch <kbusch@kernel.org> | 2023-10-27 10:56:53 -0700 |
|---|---|---|
| committer | Keith Busch <kbusch@kernel.org> | 2023-11-17 13:59:00 -0800 |
| commit | b776be1251af094b72ec24c425f3b761ed0115db (patch) | |
| tree | da8f964d392b7a6fd8b3f730bd1ea64c869182b8 | |
| parent | 2fcfe7bf8f223c93eeeff4ce6de7209573a51da7 (diff) | |
| download | linux-user-metadata.tar.gz | |
io_uring: remove uring_cmd cookieuser-metadata
No more users of this field.
Signed-off-by: Keith Busch <kbusch@kernel.org>
| -rw-r--r-- | include/linux/io_uring.h | 8 | ||||
| -rw-r--r-- | io_uring/uring_cmd.c | 1 |
2 files changed, 2 insertions, 7 deletions
diff --git a/include/linux/io_uring.h b/include/linux/io_uring.h index fe23bf88f86fa8..9e6ce6d4ab51fc 100644 --- a/include/linux/io_uring.h +++ b/include/linux/io_uring.h @@ -32,12 +32,8 @@ enum io_uring_cmd_flags { struct io_uring_cmd { struct file *file; const struct io_uring_sqe *sqe; - union { - /* callback to defer completions to task context */ - void (*task_work_cb)(struct io_uring_cmd *cmd, unsigned); - /* used for polled completion */ - void *cookie; - }; + /* callback to defer completions to task context */ + void (*task_work_cb)(struct io_uring_cmd *cmd, unsigned); u32 cmd_op; u32 flags; u8 pdu[32]; /* available inline for free use */ diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c index acbc2924ecd211..b39ec25c36bc3a 100644 --- a/io_uring/uring_cmd.c +++ b/io_uring/uring_cmd.c @@ -182,7 +182,6 @@ int io_uring_cmd(struct io_kiocb *req, unsigned int issue_flags) return -EOPNOTSUPP; issue_flags |= IO_URING_F_IOPOLL; req->iopoll_completed = 0; - WRITE_ONCE(ioucmd->cookie, NULL); } ret = file->f_op->uring_cmd(ioucmd, issue_flags); |