Commit 2cb4b05e authored Jun 29, 2010 by Changli Gao Committed by Jens Axboe Jun 30, 2010

splice: direct_splice_actor() should not use pos in sd



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>

parent 984bc960

fs/splice.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}

		/**