Skip to content

Commit

Permalink
splice: direct_splice_actor() should not use pos in sd
Browse files Browse the repository at this point in the history
direct_splice_actor() shouldn't use sd->pos, as sd->pos is for file reading,
file->f_pos should be used instead.

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
----
 fs/splice.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
  • Loading branch information
Changli Gao authored and Jens Axboe committed Jun 30, 2010
1 parent 984bc96 commit 2cb4b05
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion fs/splice.c
Original file line number Diff line number Diff line change
Expand Up @@ -1282,7 +1282,8 @@ static int direct_splice_actor(struct pipe_inode_info *pipe,
{
struct file *file = sd->u.file;

return do_splice_from(pipe, file, &sd->pos, sd->total_len, sd->flags);
return do_splice_from(pipe, file, &file->f_pos, sd->total_len,
sd->flags);
}

/**
Expand Down

0 comments on commit 2cb4b05

Please sign in to comment.