[kernel] r18094 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Fri Sep 16 02:25:15 2011
New Revision: 18094

Log:
splice: Fix write position in output file (Closes: #641419)

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/splice-direct_splice_actor-should-not-use-pos-in-sd.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/37

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Fri Sep 16 02:22:17 2011	(r18093)
+++ dists/squeeze/linux-2.6/debian/changelog	Fri Sep 16 02:25:15 2011	(r18094)
@@ -3,6 +3,7 @@
   [ Ben Hutchings ]
   * pm: Fix definition of SET_SYSTEM_SLEEP_PM_OPS used in backported drivers
     (fixes FTBFS on ia64)
+  * splice: Fix write position in output file (Closes: #641419)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 14 Sep 2011 14:47:36 +0100
 

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/splice-direct_splice_actor-should-not-use-pos-in-sd.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/splice-direct_splice_actor-should-not-use-pos-in-sd.patch	Fri Sep 16 02:25:15 2011	(r18094)
@@ -0,0 +1,36 @@
+From: Changli Gao <xiaosuo at gmail.com>
+Date: Tue, 29 Jun 2010 13:09:18 +0200
+Subject: [PATCH] splice: direct_splice_actor() should not use pos in sd
+
+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 <xiaosuo at gmail.com>
+Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
+----
+ fs/splice.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+Signed-off-by: Jens Axboe <jaxboe at 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);
+ }
+ 
+ /**
+-- 
+1.7.5.4
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/37
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/37	Fri Sep 16 02:22:17 2011	(r18093)
+++ dists/squeeze/linux-2.6/debian/patches/series/37	Fri Sep 16 02:25:15 2011	(r18094)
@@ -1,2 +1,3 @@
 - features/all/pm-Define-SET_SYSTEM_SLEEP_PM_OPS.patch
 + features/all/pm-Define-SET_SYSTEM_SLEEP_PM_OPS-2.patch
++ bugfix/all/splice-direct_splice_actor-should-not-use-pos-in-sd.patch