Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

io_uring: convert splice to use io_cmd_type

Signed-off-by: Jens Axboe <axboe@kernel.dk>

+4 -5
+4 -5
io_uring/io_uring.c
··· 980 980 struct file *file; 981 981 struct io_cmd_data cmd; 982 982 struct io_rsrc_update rsrc_update; 983 - struct io_splice splice; 984 983 struct io_provide_buf pbuf; 985 984 struct io_msg msg; 986 985 struct io_xattr xattr; ··· 4917 4918 static int __io_splice_prep(struct io_kiocb *req, 4918 4919 const struct io_uring_sqe *sqe) 4919 4920 { 4920 - struct io_splice *sp = &req->splice; 4921 + struct io_splice *sp = io_kiocb_to_cmd(req); 4921 4922 unsigned int valid_flags = SPLICE_F_FD_IN_FIXED | SPLICE_F_ALL; 4922 4923 4923 4924 sp->len = READ_ONCE(sqe->len); ··· 4938 4939 4939 4940 static int io_tee(struct io_kiocb *req, unsigned int issue_flags) 4940 4941 { 4941 - struct io_splice *sp = &req->splice; 4942 + struct io_splice *sp = io_kiocb_to_cmd(req); 4942 4943 struct file *out = sp->file_out; 4943 4944 unsigned int flags = sp->flags & ~SPLICE_F_FD_IN_FIXED; 4944 4945 struct file *in; ··· 4970 4971 4971 4972 static int io_splice_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 4972 4973 { 4973 - struct io_splice *sp = &req->splice; 4974 + struct io_splice *sp = io_kiocb_to_cmd(req); 4974 4975 4975 4976 sp->off_in = READ_ONCE(sqe->splice_off_in); 4976 4977 sp->off_out = READ_ONCE(sqe->off); ··· 4979 4980 4980 4981 static int io_splice(struct io_kiocb *req, unsigned int issue_flags) 4981 4982 { 4982 - struct io_splice *sp = &req->splice; 4983 + struct io_splice *sp = io_kiocb_to_cmd(req); 4983 4984 struct file *out = sp->file_out; 4984 4985 unsigned int flags = sp->flags & ~SPLICE_F_FD_IN_FIXED; 4985 4986 loff_t *poff_in, *poff_out;