Commit 584dc5db authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ed6a75e3 293007b0

include/linux/io_uring.h

+5 −5
Original line number Diff line number Diff line
@@ -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)