Author: shadzik Date: Fri Sep 11 01:05:08 2009 GMT
Module: packages Tag: Titanium
---- Log message:
- up to 2.6.31
---- Files affected:
packages/kernel-desktop:
kernel-desktop-unionfs.patch (1.2.2.3 -> 1.2.2.4)
---- Diffs:
================================================================
Index: packages/kernel-desktop/kernel-desktop-unionfs.patch
diff -u packages/kernel-desktop/kernel-desktop-unionfs.patch:1.2.2.3
packages/kernel-desktop/kernel-desktop-unionfs.patch:1.2.2.4
--- packages/kernel-desktop/kernel-desktop-unionfs.patch:1.2.2.3 Thu Jun
25 10:06:27 2009
+++ packages/kernel-desktop/kernel-desktop-unionfs.patch Fri Sep 11
03:05:02 2009
@@ -637,83 +637,6 @@
static inline struct dentry *
do_revalidate(struct dentry *dentry, struct nameidata *nd)
-diff --git a/fs/splice.c b/fs/splice.c
-index 666953d..26bf825 100644
---- a/fs/splice.c
-+++ b/fs/splice.c
-@@ -905,8 +905,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
- /*
- * Attempt to initiate a splice from pipe to file.
- */
--static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
-- loff_t *ppos, size_t len, unsigned int flags)
-+long vfs_splice_from(struct pipe_inode_info *pipe, struct file *out,
-+ loff_t *ppos, size_t len, unsigned int flags)
- {
- int ret;
-
-@@ -925,13 +925,14 @@ static long do_splice_from(struct pipe_inode_info *pipe,
struct file *out,
-
- return out->f_op->splice_write(pipe, out, ppos, len, flags);
- }
-+EXPORT_SYMBOL_GPL(vfs_splice_from);
-
- /*
- * Attempt to initiate a splice from a file to a pipe.
- */
--static long do_splice_to(struct file *in, loff_t *ppos,
-- struct pipe_inode_info *pipe, size_t len,
-- unsigned int flags)
-+long vfs_splice_to(struct file *in, loff_t *ppos,
-+ struct pipe_inode_info *pipe, size_t len,
-+ unsigned int flags)
- {
- int ret;
-
-@@ -947,6 +948,7 @@ static long do_splice_to(struct file *in, loff_t *ppos,
-
- return in->f_op->splice_read(in, ppos, pipe, len, flags);
- }
-+EXPORT_SYMBOL_GPL(vfs_splice_to);
-
- /**
- * splice_direct_to_actor - splices data directly between two non-pipes
-@@ -1016,7 +1018,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct
splice_desc *sd,
- size_t read_len;
- loff_t pos = sd->pos, prev_pos = pos;
-
-- ret = do_splice_to(in, &pos, pipe, len, flags);
-+ ret = vfs_splice_to(in, &pos, pipe, len, flags);
- if (unlikely(ret <= 0))
- goto out_release;
-
-@@ -1075,7 +1077,7 @@ 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 vfs_splice_from(pipe, file, &sd->pos, sd->total_len, sd->flags);
- }
-
- /**
-@@ -1149,7 +1151,7 @@ static long do_splice(struct file *in, loff_t __user
*off_in,
- } else
- off = &out->f_pos;
-
-- ret = do_splice_from(pipe, out, off, len, flags);
-+ ret = vfs_splice_from(pipe, out, off, len, flags);
-
- if (off_out && copy_to_user(off_out, off, sizeof(loff_t)))
- ret = -EFAULT;
-@@ -1170,7 +1172,7 @@ static long do_splice(struct file *in, loff_t __user
*off_in,
- } else
- off = &in->f_pos;
-
-- ret = do_splice_to(in, off, pipe, len, flags);
-+ ret = vfs_splice_to(in, off, pipe, len, flags);
-
- if (off_in && copy_to_user(off_in, off, sizeof(loff_t)))
- ret = -EFAULT;
diff --git a/fs/stack.c b/fs/stack.c
index 67716f6..cc1443d 100644
--- a/fs/stack.c
@@ -11374,3 +11297,78 @@
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
{
+--- linux-2.6.31-rc9/fs/splice.c.orig 2009-09-06 01:38:12.000000000 +0200
++++ linux-2.6.31-rc9/fs/splice.c 2009-09-07 17:41:55.000000000 +0200
+@@ -1057,8 +1057,8 @@
+ /*
+ * Attempt to initiate a splice from pipe to file.
+ */
+-static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+- loff_t *ppos, size_t len, unsigned int flags)
++long vfs_splice_from(struct pipe_inode_info *pipe, struct file *out,
++ loff_t *ppos, size_t len, unsigned int flags)
+ {
+ ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
+ loff_t *, size_t, unsigned int);
+@@ -1080,13 +1080,14 @@
+
+ return splice_write(pipe, out, ppos, len, flags);
+ }
++EXPORT_SYMBOL_GPL(vfs_splice_from);
+
+ /*
+ * Attempt to initiate a splice from a file to a pipe.
+ */
+-static long do_splice_to(struct file *in, loff_t *ppos,
+- struct pipe_inode_info *pipe, size_t len,
+- unsigned int flags)
++long vfs_splice_to(struct file *in, loff_t *ppos,
++ struct pipe_inode_info *pipe, size_t len,
++ unsigned int flags)
+ {
+ ssize_t (*splice_read)(struct file *, loff_t *,
+ struct pipe_inode_info *, size_t, unsigned int);
+@@ -1105,6 +1106,7 @@
+
+ return splice_read(in, ppos, pipe, len, flags);
+ }
++EXPORT_SYMBOL_GPL(vfs_splice_to);
+
+ /**
+ * splice_direct_to_actor - splices data directly between two non-pipes
+@@ -1174,7 +1176,7 @@
+ size_t read_len;
+ loff_t pos = sd->pos, prev_pos = pos;
+
+- ret = do_splice_to(in, &pos, pipe, len, flags);
++ ret = vfs_splice_to(in, &pos, pipe, len, flags);
+ if (unlikely(ret <= 0))
+ goto out_release;
+
+@@ -1233,7 +1235,7 @@
+ {
+ struct file *file = sd->u.file;
+
+- return do_splice_from(pipe, file, &sd->pos, sd->total_len, sd->flags);
++ return vfs_splice_from(pipe, file, &sd->pos, sd->total_len, sd->flags);
+ }
+
+ /**
+@@ -1330,7 +1332,7 @@
+ } else
+ off = &out->f_pos;
+
+- ret = do_splice_from(ipipe, out, off, len, flags);
++ ret = vfs_splice_from(ipipe, out, off, len, flags);
+
+ if (off_out && copy_to_user(off_out, off, sizeof(loff_t)))
+ ret = -EFAULT;
+@@ -1350,7 +1352,7 @@
+ } else
+ off = &in->f_pos;
+
+- ret = do_splice_to(in, off, opipe, len, flags);
++ ret = vfs_splice_to(in, off, opipe, len, flags);
+
+ if (off_in && copy_to_user(off_in, off, sizeof(loff_t)))
+ ret = -EFAULT;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-desktop/kernel-desktop-unionfs.patch?r1=1.2.2.3&r2=1.2.2.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
