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
17338fcc
Commit
17338fcc
authored
Mar 20, 2013
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lift sb_start_write into default_file_splice_write()
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
03d95eb2
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
fs/splice.c
fs/splice.c
+2
-2
No files found.
fs/splice.c
View file @
17338fcc
...
@@ -1052,9 +1052,7 @@ static int write_pipe_buf(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
...
@@ -1052,9 +1052,7 @@ static int write_pipe_buf(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
loff_t
tmp
=
sd
->
pos
;
loff_t
tmp
=
sd
->
pos
;
data
=
buf
->
ops
->
map
(
pipe
,
buf
,
0
);
data
=
buf
->
ops
->
map
(
pipe
,
buf
,
0
);
file_start_write
(
sd
->
u
.
file
);
ret
=
__kernel_write
(
sd
->
u
.
file
,
data
+
buf
->
offset
,
sd
->
len
,
&
tmp
);
ret
=
__kernel_write
(
sd
->
u
.
file
,
data
+
buf
->
offset
,
sd
->
len
,
&
tmp
);
file_end_write
(
sd
->
u
.
file
);
buf
->
ops
->
unmap
(
pipe
,
buf
,
data
);
buf
->
ops
->
unmap
(
pipe
,
buf
,
data
);
return
ret
;
return
ret
;
...
@@ -1066,7 +1064,9 @@ static ssize_t default_file_splice_write(struct pipe_inode_info *pipe,
...
@@ -1066,7 +1064,9 @@ static ssize_t default_file_splice_write(struct pipe_inode_info *pipe,
{
{
ssize_t
ret
;
ssize_t
ret
;
file_start_write
(
out
);
ret
=
splice_from_pipe
(
pipe
,
out
,
ppos
,
len
,
flags
,
write_pipe_buf
);
ret
=
splice_from_pipe
(
pipe
,
out
,
ppos
,
len
,
flags
,
write_pipe_buf
);
file_end_write
(
out
);
if
(
ret
>
0
)
if
(
ret
>
0
)
*
ppos
+=
ret
;
*
ppos
+=
ret
;
...
...
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