packages (Titanium): kernel-desktop/kernel-desktop-unionfs.patch - updated
shadzik
shadzik at pld-linux.org
Mon Aug 9 16:24:24 CEST 2010
Author: shadzik Date: Mon Aug 9 14:24:24 2010 GMT
Module: packages Tag: Titanium
---- Log message:
- updated
---- Files affected:
packages/kernel-desktop:
kernel-desktop-unionfs.patch (1.2.2.6 -> 1.2.2.7)
---- Diffs:
================================================================
Index: packages/kernel-desktop/kernel-desktop-unionfs.patch
diff -u packages/kernel-desktop/kernel-desktop-unionfs.patch:1.2.2.6 packages/kernel-desktop/kernel-desktop-unionfs.patch:1.2.2.7
--- packages/kernel-desktop/kernel-desktop-unionfs.patch:1.2.2.6 Mon Aug 9 16:10:42 2010
+++ packages/kernel-desktop/kernel-desktop-unionfs.patch Mon Aug 9 16:24:18 2010
@@ -636,11 +636,12 @@
if (unlikely(ret <= 0))
goto out_release;
-@@ -1231,7 +1233,7 @@ static int direct_splice_actor(struct pipe_inode_info *pipe,
+@@ -1232,8 +1234,7 @@
{
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);
+ return vfs_splice_from(pipe, file, &sd->pos, sd->total_len, sd->flags);
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-desktop/kernel-desktop-unionfs.patch?r1=1.2.2.6&r2=1.2.2.7&f=u
More information about the pld-cvs-commit
mailing list