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
nexedi
linux
Commits
50cd2c57
Commit
50cd2c57
authored
May 23, 2013
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lift file_*_write out of do_splice_direct()
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
500368f7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
fs/read_write.c
fs/read_write.c
+2
-0
fs/splice.c
fs/splice.c
+0
-2
No files found.
fs/read_write.c
View file @
50cd2c57
...
@@ -1129,7 +1129,9 @@ static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos,
...
@@ -1129,7 +1129,9 @@ static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos,
if (in.file->f_flags & O_NONBLOCK)
if (in.file->f_flags & O_NONBLOCK)
fl = SPLICE_F_NONBLOCK;
fl = SPLICE_F_NONBLOCK;
#endif
#endif
file_start_write
(
out
.
file
);
retval
=
do_splice_direct
(
in
.
file
,
&
pos
,
out
.
file
,
&
out_pos
,
count
,
fl
);
retval
=
do_splice_direct
(
in
.
file
,
&
pos
,
out
.
file
,
&
out_pos
,
count
,
fl
);
file_end_write
(
out
.
file
);
if
(
retval
>
0
)
{
if
(
retval
>
0
)
{
add_rchar
(
current
,
retval
);
add_rchar
(
current
,
retval
);
...
...
fs/splice.c
View file @
50cd2c57
...
@@ -1303,11 +1303,9 @@ long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
...
@@ -1303,11 +1303,9 @@ long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
};
};
long
ret
;
long
ret
;
file_start_write
(
out
);
ret
=
splice_direct_to_actor
(
in
,
&
sd
,
direct_splice_actor
);
ret
=
splice_direct_to_actor
(
in
,
&
sd
,
direct_splice_actor
);
if
(
ret
>
0
)
if
(
ret
>
0
)
*
ppos
=
sd
.
pos
;
*
ppos
=
sd
.
pos
;
file_end_write
(
out
);
return
ret
;
return
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