diff options
| author | Linus Torvalds | 2023-05-12 16:39:05 -0500 |
|---|---|---|
| committer | Linus Torvalds | 2023-05-12 16:39:05 -0500 |
| commit | 584dc5dbcbcca71cc7ccce9077a1456842c26179 (patch) | |
| tree | c558d7d2c95feab08734e11e2232627d2529387f /include/linux | |
| parent | ed6a75e3133bca544849b967f7f3233cddb66090 (diff) | |
| parent | 293007b033418c8c9d1b35d68dec49a500750fde (diff) | |
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
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/io_uring.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/io_uring.h b/include/linux/io_uring.h index 3399d979ee1c..7fe31b2cd02f 100644 --- a/include/linux/io_uring.h +++ b/include/linux/io_uring.h @@ -36,6 +36,11 @@ struct io_uring_cmd { u8 pdu[32]; /* available inline for free use */ }; +static inline const void *io_uring_sqe_cmd(const struct io_uring_sqe *sqe) +{ + return sqe->cmd; +} + #if defined(CONFIG_IO_URING) int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw, struct iov_iter *iter, void *ioucmd); @@ -66,11 +71,6 @@ static inline void io_uring_free(struct task_struct *tsk) if (tsk->io_uring) __io_uring_free(tsk); } - -static inline const void *io_uring_sqe_cmd(const struct io_uring_sqe *sqe) -{ - return sqe->cmd; -} #else static inline int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw, struct iov_iter *iter, void *ioucmd) |