Skip to content

Commit df3a776

Browse files
calebsanderaxboe
authored andcommitted
io_uring/uring_cmd: add io_uring_cmd_tw_t type alias
Introduce a function pointer type alias io_uring_cmd_tw_t for the uring_cmd task work callback. This avoids repeating the signature in several places. Also name both arguments to the callback to clarify what they represent. Signed-off-by: Caleb Sander Mateos <csander@purestorage.com> Reviewed-by: Keith Busch <kbusch@kernel.org> Link: https://lore.kernel.org/r/20250902160657.1726828-1-csander@purestorage.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 8b9c9a2 commit df3a776

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

include/linux/io_uring/cmd.h

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,14 @@
1111
/* io_uring_cmd is being issued again */
1212
#define IORING_URING_CMD_REISSUE (1U << 31)
1313

14+
typedef void (*io_uring_cmd_tw_t)(struct io_uring_cmd *cmd,
15+
unsigned issue_flags);
16+
1417
struct io_uring_cmd {
1518
struct file *file;
1619
const struct io_uring_sqe *sqe;
1720
/* callback to defer completions to task context */
18-
void (*task_work_cb)(struct io_uring_cmd *cmd, unsigned);
21+
io_uring_cmd_tw_t task_work_cb;
1922
u32 cmd_op;
2023
u32 flags;
2124
u8 pdu[32]; /* available inline for free use */
@@ -57,7 +60,7 @@ void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret, u64 res2,
5760
unsigned issue_flags);
5861

5962
void __io_uring_cmd_do_in_task(struct io_uring_cmd *ioucmd,
60-
void (*task_work_cb)(struct io_uring_cmd *, unsigned),
63+
io_uring_cmd_tw_t task_work_cb,
6164
unsigned flags);
6265

6366
/*
@@ -106,7 +109,7 @@ static inline void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret,
106109
{
107110
}
108111
static inline void __io_uring_cmd_do_in_task(struct io_uring_cmd *ioucmd,
109-
void (*task_work_cb)(struct io_uring_cmd *, unsigned),
112+
io_uring_tw_t task_work_cb,
110113
unsigned flags)
111114
{
112115
}
@@ -143,13 +146,13 @@ static inline void io_uring_cmd_iopoll_done(struct io_uring_cmd *ioucmd,
143146

144147
/* users must follow the IOU_F_TWQ_LAZY_WAKE semantics */
145148
static inline void io_uring_cmd_do_in_task_lazy(struct io_uring_cmd *ioucmd,
146-
void (*task_work_cb)(struct io_uring_cmd *, unsigned))
149+
io_uring_cmd_tw_t task_work_cb)
147150
{
148151
__io_uring_cmd_do_in_task(ioucmd, task_work_cb, IOU_F_TWQ_LAZY_WAKE);
149152
}
150153

151154
static inline void io_uring_cmd_complete_in_task(struct io_uring_cmd *ioucmd,
152-
void (*task_work_cb)(struct io_uring_cmd *, unsigned))
155+
io_uring_cmd_tw_t task_work_cb)
153156
{
154157
__io_uring_cmd_do_in_task(ioucmd, task_work_cb, 0);
155158
}

io_uring/uring_cmd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ static void io_uring_cmd_work(struct io_kiocb *req, io_tw_token_t tw)
126126
}
127127

128128
void __io_uring_cmd_do_in_task(struct io_uring_cmd *ioucmd,
129-
void (*task_work_cb)(struct io_uring_cmd *, unsigned),
129+
io_uring_cmd_tw_t task_work_cb,
130130
unsigned flags)
131131
{
132132
struct io_kiocb *req = cmd_to_io_kiocb(ioucmd);

0 commit comments

Comments
 (0)