SOURCES: kernel-aufs2.patch - adjusted for unionfs changes

[zbyniu]

Author: zbyniu                       Date: Sun Apr 26 21:46:27 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- adjusted for unionfs changes

---- Files affected:
SOURCES:
   kernel-aufs2.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/kernel-aufs2.patch
diff -u SOURCES/kernel-aufs2.patch:1.1 SOURCES/kernel-aufs2.patch:1.2
--- SOURCES/kernel-aufs2.patch:1.1	Sun Apr 26 23:44:59 2009
+++ SOURCES/kernel-aufs2.patch	Sun Apr 26 23:46:22 2009
@@ -2890,10 +2890,7 @@
 index dc20db3..a4e9a65 100644
 --- a/fs/Makefile
 +++ b/fs/Makefile
-@@ -124,3 +124,4 @@ obj-$(CONFIG_DEBUG_FS)		+= debugfs/
- obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
- obj-$(CONFIG_BTRFS_FS)		+= btrfs/
- obj-$(CONFIG_GFS2_FS)           += gfs2/
+@@ -0,0 +0,1 @@
 +obj-$(CONFIG_AUFS_FS)           += aufs/
 diff --git a/fs/aufs/Kconfig b/fs/aufs/Kconfig
 new file mode 100644
@@ -21940,7 +21937,7 @@
 +	long err;
 +
 +	lockdep_off();
-+	err = do_splice_to(in, ppos, pipe, len, flags);
++	err = vfs_splice_to(in, ppos, pipe, len, flags);
 +	lockdep_on();
 +	if (err >= 0)
 +		vfsub_update_h_iattr(&in->f_path, /*did*/NULL); /*ignore*/
@@ -21953,7 +21950,7 @@
 +	long err;
 +
 +	lockdep_off();
-+	err = do_splice_from(pipe, out, ppos, len, flags);
++	err = vfs_splice_from(pipe, out, ppos, len, flags);
 +	lockdep_on();
 +	if (err >= 0)
 +		vfsub_update_h_iattr(&out->f_path, /*did*/NULL); /*ignore*/
@@ -25671,34 +25668,6 @@
  		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
@@ -25839,9 +25808,9 @@
  extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *,
  				      splice_direct_actor *);
  
-+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
++extern long vfs_splice_from(struct pipe_inode_info *pipe, struct file *out,
 +			   loff_t *ppos, size_t len, unsigned int flags);
-+extern long do_splice_to(struct file *in, loff_t *ppos,
++extern long vfs_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/SOURCES/kernel-aufs2.patch?r1=1.1&r2=1.2&f=u