Gitweb: http://git.kernel.org/linus/2cb4b05e7647891b46b91c07c9a60304803d1688
Commit: 2cb4b05e7647891b46b91c07c9a60304803d1688
Parent: 984bc9601f64fd341b8573021d7c999f1f1499a9
Author: Changli Gao <xiaosuo@gmail.com>
AuthorDate: Tue Jun 29 13:09:18 2010 +0200
Committer: Jens Axboe <jaxboe@fusionio.com>
CommitDate: Wed Jun 30 08:12:37 2010 +0200
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>
---
fs/splice.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/fs/splice.c b/fs/splice.c
index 740e6b9..4190049 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -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);
}
/**
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
