From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20111102221454.143823023@clark.kroah.org> Date: Wed, 02 Nov 2011 15:14:10 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Changli Gao , Miklos Szeredi , Jens Axboe Subject: [044/107] splice: direct_splice_actor() should not use pos in sd In-Reply-To: <20111102221600.GA26650@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: 2.6.32-longterm review patch. If anyone has any objections, please let us know. ------------------ From: Changli Gao commit 2cb4b05e7647891b46b91c07c9a60304803d1688 upstream. 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 Signed-off-by: Miklos Szeredi Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- fs/splice.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/fs/splice.c +++ b/fs/splice.c @@ -1221,7 +1221,8 @@ static int direct_splice_actor(struct pi { 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); } /**