Commit 2511d303 authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring: convert splice to use io_cmd_type 



Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 3e93a357

io_uring/io_uring.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -980,7 +980,6 @@ struct io_kiocb { 
		struct file		*file;

		struct file		*file;

		struct io_cmd_data	cmd;

		struct io_cmd_data	cmd;

		struct io_rsrc_update	rsrc_update;

		struct io_rsrc_update	rsrc_update;

		struct io_splice	splice;

		struct io_provide_buf	pbuf;

		struct io_provide_buf	pbuf;

		struct io_msg		msg;

		struct io_msg		msg;

		struct io_xattr		xattr;

		struct io_xattr		xattr;
@@ -4918,7 +4917,7 @@ static int io_uring_cmd(struct io_kiocb *req, unsigned int issue_flags) 
static int __io_splice_prep(struct io_kiocb *req,

static int __io_splice_prep(struct io_kiocb *req,

			    const struct io_uring_sqe *sqe)

			    const struct io_uring_sqe *sqe)

{

{

	struct io_splice *sp = &req->splice;

	struct io_splice *sp = io_kiocb_to_cmd(req);

	unsigned int valid_flags = SPLICE_F_FD_IN_FIXED | SPLICE_F_ALL;

	unsigned int valid_flags = SPLICE_F_FD_IN_FIXED | SPLICE_F_ALL;





	sp->len = READ_ONCE(sqe->len);

	sp->len = READ_ONCE(sqe->len);
@@ -4939,7 +4938,7 @@ static int io_tee_prep(struct io_kiocb *req, 




static int io_tee(struct io_kiocb *req, unsigned int issue_flags)

static int io_tee(struct io_kiocb *req, unsigned int issue_flags)

{

{

	struct io_splice *sp = &req->splice;

	struct io_splice *sp = io_kiocb_to_cmd(req);

	struct file *out = sp->file_out;

	struct file *out = sp->file_out;

	unsigned int flags = sp->flags & ~SPLICE_F_FD_IN_FIXED;

	unsigned int flags = sp->flags & ~SPLICE_F_FD_IN_FIXED;

	struct file *in;

	struct file *in;
@@ -4971,7 +4970,7 @@ static int io_tee(struct io_kiocb *req, unsigned int issue_flags) 




static int io_splice_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

static int io_splice_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

{

{

	struct io_splice *sp = &req->splice;

	struct io_splice *sp = io_kiocb_to_cmd(req);





	sp->off_in = READ_ONCE(sqe->splice_off_in);

	sp->off_in = READ_ONCE(sqe->splice_off_in);

	sp->off_out = READ_ONCE(sqe->off);

	sp->off_out = READ_ONCE(sqe->off);
@@ -4980,7 +4979,7 @@ static int io_splice_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 




static int io_splice(struct io_kiocb *req, unsigned int issue_flags)

static int io_splice(struct io_kiocb *req, unsigned int issue_flags)

{

{

	struct io_splice *sp = &req->splice;

	struct io_splice *sp = io_kiocb_to_cmd(req);

	struct file *out = sp->file_out;

	struct file *out = sp->file_out;

	unsigned int flags = sp->flags & ~SPLICE_F_FD_IN_FIXED;

	unsigned int flags = sp->flags & ~SPLICE_F_FD_IN_FIXED;

	loff_t *poff_in, *poff_out;

	loff_t *poff_in, *poff_out;