packages: kernel/kernel-aufs2.patch - back to rev 1.1

zbyniu zbyniu at pld-linux.org
Wed Apr 29 00:02:49 CEST 2009


Author: zbyniu                       Date: Tue Apr 28 22:02:48 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- back to rev 1.1

---- Files affected:
packages/kernel:
   kernel-aufs2.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-aufs2.patch
diff -u packages/kernel/kernel-aufs2.patch:1.3 packages/kernel/kernel-aufs2.patch:1.4
--- packages/kernel/kernel-aufs2.patch:1.3	Mon Apr 27 00:56:36 2009
+++ packages/kernel/kernel-aufs2.patch	Wed Apr 29 00:02:43 2009
@@ -21940,7 +21940,7 @@
 +	long err;
 +
 +	lockdep_off();
-+	err = vfs_splice_to(in, ppos, pipe, len, flags);
++	err = do_splice_to(in, ppos, pipe, len, flags);
 +	lockdep_on();
 +	if (err >= 0)
 +		vfsub_update_h_iattr(&in->f_path, /*did*/NULL); /*ignore*/
@@ -21953,7 +21953,7 @@
 +	long err;
 +
 +	lockdep_off();
-+	err = vfs_splice_from(pipe, out, ppos, len, flags);
++	err = do_splice_from(pipe, out, ppos, len, flags);
 +	lockdep_on();
 +	if (err >= 0)
 +		vfsub_update_h_iattr(&out->f_path, /*did*/NULL); /*ignore*/
@@ -25671,6 +25671,34 @@
  		struct dentry *base, int len)
  {
  	unsigned long hash;
+diff --git a/fs/splice.c b/fs/splice.c
+index 4ed0ba4..2fb3d17 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -888,8 +888,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 do_splice_from(struct pipe_inode_info *pipe, struct file *out,
++		    loff_t *ppos, size_t len, unsigned int flags)
+ {
+ 	int ret;
+ 
+@@ -912,9 +912,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+ /*
+  * 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 do_splice_to(struct file *in, loff_t *ppos,
++		  struct pipe_inode_info *pipe, size_t len,
++		  unsigned int flags)
+ {
+ 	int ret;
+ 
 diff --git a/include/linux/Kbuild b/include/linux/Kbuild
 index 106c3ba..d0c7262 100644
 --- a/include/linux/Kbuild
@@ -25811,9 +25839,9 @@
  extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *,
  				      splice_direct_actor *);
  
-+extern long vfs_splice_from(struct pipe_inode_info *pipe, struct file *out,
++extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
 +			   loff_t *ppos, size_t len, unsigned int flags);
-+extern long vfs_splice_to(struct file *in, loff_t *ppos,
++extern long do_splice_to(struct file *in, loff_t *ppos,
 +			 struct pipe_inode_info *pipe, size_t len,
 +			 unsigned int flags);
 +
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-aufs2.patch?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list