Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
75065ff6
Commit
75065ff6
authored
May 08, 2008
by
Jens Axboe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "relay: fix splice problem"
This reverts commit
c3270e57
.
parent
ffee0259
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
fs/splice.c
fs/splice.c
+1
-1
kernel/relay.c
kernel/relay.c
+1
-1
No files found.
fs/splice.c
View file @
75065ff6
...
@@ -1072,7 +1072,7 @@ long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
...
@@ -1072,7 +1072,7 @@ long do_splice_direct(struct file *in, loff_t *ppos, struct file *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
+=
ret
;
return
ret
;
return
ret
;
}
}
...
...
kernel/relay.c
View file @
75065ff6
...
@@ -1191,7 +1191,7 @@ static ssize_t relay_file_splice_read(struct file *in,
...
@@ -1191,7 +1191,7 @@ static ssize_t relay_file_splice_read(struct file *in,
ret
=
0
;
ret
=
0
;
spliced
=
0
;
spliced
=
0
;
while
(
len
&&
!
spliced
)
{
while
(
len
)
{
ret
=
subbuf_splice_actor
(
in
,
ppos
,
pipe
,
len
,
flags
,
&
nonpad_ret
);
ret
=
subbuf_splice_actor
(
in
,
ppos
,
pipe
,
len
,
flags
,
&
nonpad_ret
);
if
(
ret
<
0
)
if
(
ret
<
0
)
break
;
break
;
...
...
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