Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
2511d303
Commit
2511d303
authored
May 24, 2022
by
Jens Axboe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
io_uring: convert splice to use io_cmd_type
Signed-off-by:
Jens Axboe
<
axboe@kernel.dk
>
parent
3e93a357
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
io_uring/io_uring.c
io_uring/io_uring.c
+4
-5
No files found.
io_uring/io_uring.c
View file @
2511d303
...
...
@@ -980,7 +980,6 @@ struct io_kiocb {
struct
file
*
file
;
struct
io_cmd_data
cmd
;
struct
io_rsrc_update
rsrc_update
;
struct
io_splice
splice
;
struct
io_provide_buf
pbuf
;
struct
io_msg
msg
;
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
,
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
;
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
)
{
struct
io_splice
*
sp
=
&
req
->
splice
;
struct
io_splice
*
sp
=
io_kiocb_to_cmd
(
req
)
;
struct
file
*
out
=
sp
->
file_out
;
unsigned
int
flags
=
sp
->
flags
&
~
SPLICE_F_FD_IN_FIXED
;
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
)
{
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_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
)
{
struct
io_splice
*
sp
=
&
req
->
splice
;
struct
io_splice
*
sp
=
io_kiocb_to_cmd
(
req
)
;
struct
file
*
out
=
sp
->
file_out
;
unsigned
int
flags
=
sp
->
flags
&
~
SPLICE_F_FD_IN_FIXED
;
loff_t
*
poff_in
,
*
poff_out
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment