From patchwork Mon Jun 28 15:18:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 57149 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 704B8B6EEB for ; Tue, 29 Jun 2010 01:18:28 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OTG6I-0002ew-8y; Mon, 28 Jun 2010 16:18:22 +0100 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OTG6F-0002eK-Bc for kernel-team@lists.ubuntu.com; Mon, 28 Jun 2010 16:18:19 +0100 Received: from sepang.rtg.net (unknown [10.0.2.5]) by mail.tpi.com (Postfix) with ESMTP id D50D91809E8; Mon, 28 Jun 2010 08:17:38 -0700 (PDT) Received: by sepang.rtg.net (Postfix, from userid 1000) id B7B2BF88CE; Mon, 28 Jun 2010 09:18:15 -0600 (MDT) To: leann.ogasawara@canonical.com Subject: Maverick pull request, LP588861, UEC:pad block corrupted Message-Id: <20100628151815.B7B2BF88CE@sepang.rtg.net> Date: Mon, 28 Jun 2010 09:18:15 -0600 (MDT) From: timg@tpi.com (Tim Gardner) Cc: kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com The following changes since commit 2fbc0c814c4ae7aaaf17ffa34c22354b835183af: Leann Ogasawara (1): UBUNTU: Ubuntu-2.6.35-6.8 are available in the git repository at: git://kernel.ubuntu.com/rtg/ubuntu-maverick.git lp588861-PAD Tim Gardner (1): [Upstream] direct_splice_actor() should not use pos in sd fs/splice.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) From 5d48c5b970784bb30a15156828f797437c6c542b Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Mon, 28 Jun 2010 06:46:11 -0600 Subject: [PATCH] [Upstream] direct_splice_actor() should not use pos in sd BugLink: http://bugs.launchpad.net/bugs/588861 This patch has not yet been accepted by upstream, so we need to watch what happens during rc4/rc5 . 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: Tim Gardner --- fs/splice.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/fs/splice.c b/fs/splice.c index d34b306..ce5949a 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -1284,7 +1284,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); } /**