Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+5
-5
+5
-5
include/linux/io_uring.h
+5
-5
include/linux/io_uring.h
···
36
36
u8 pdu[32]; /* available inline for free use */
37
37
};
38
38
39
+
static inline const void *io_uring_sqe_cmd(const struct io_uring_sqe *sqe)
40
+
{
41
+
return sqe->cmd;
42
+
}
43
+
39
44
#if defined(CONFIG_IO_URING)
40
45
int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw,
41
46
struct iov_iter *iter, void *ioucmd);
···
70
65
{
71
66
if (tsk->io_uring)
72
67
__io_uring_free(tsk);
73
-
}
74
-
75
-
static inline const void *io_uring_sqe_cmd(const struct io_uring_sqe *sqe)
76
-
{
77
-
return sqe->cmd;
78
68
}
79
69
#else
80
70
static inline int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw,