Skip to content

Commit 584dc5d

Browse files
committed
Merge tag 'io_uring-6.4-2023-05-12' of git://git.kernel.dk/linux
Pull io_uring fix from Jens Axboe: "Just a single fix making io_uring_sqe_cmd() available regardless of CONFIG_IO_URING, fixing a regression introduced during the merge window if nvme was selected but io_uring was not" * tag 'io_uring-6.4-2023-05-12' of git://git.kernel.dk/linux: io_uring: make io_uring_sqe_cmd() unconditionally available
2 parents ed6a75e + 293007b commit 584dc5d

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

include/linux/io_uring.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ struct io_uring_cmd {
3636
u8 pdu[32]; /* available inline for free use */
3737
};
3838

39+
static inline const void *io_uring_sqe_cmd(const struct io_uring_sqe *sqe)
40+
{
41+
return sqe->cmd;
42+
}
43+
3944
#if defined(CONFIG_IO_URING)
4045
int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw,
4146
struct iov_iter *iter, void *ioucmd);
@@ -66,11 +71,6 @@ static inline void io_uring_free(struct task_struct *tsk)
6671
if (tsk->io_uring)
6772
__io_uring_free(tsk);
6873
}
69-
70-
static inline const void *io_uring_sqe_cmd(const struct io_uring_sqe *sqe)
71-
{
72-
return sqe->cmd;
73-
}
7474
#else
7575
static inline int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw,
7676
struct iov_iter *iter, void *ioucmd)

0 commit comments

Comments
 (0)