packages: kernel/kernel-aufs2-unionfs.patch (NEW) - resolve patching confli...

[baggins]

Author: baggins                      Date: Wed Sep 29 08:56:00 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- resolve patching conflicts between unionfs and aufs2
  with this patch we can apply both fs-es without modifying respective patches

---- Files affected:
packages/kernel:
   kernel-aufs2-unionfs.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kernel/kernel-aufs2-unionfs.patch
diff -u /dev/null packages/kernel/kernel-aufs2-unionfs.patch:1.1
--- /dev/null	Wed Sep 29 10:56:00 2010
+++ packages/kernel/kernel-aufs2-unionfs.patch	Wed Sep 29 10:55:55 2010
@@ -0,0 +1,91 @@
+diff --git a/fs/splice.c b/fs/splice.c
+index efdbfec..e01a51e 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1104,8 +1104,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+ /*
+  * Attempt to initiate a splice from pipe to file.
+  */
+-long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+-		    loff_t *ppos, size_t len, unsigned int flags)
++static long do_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);
+@@ -1128,14 +1128,13 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+ 
+ 	return splice_write(pipe, out, ppos, len, flags);
+ }
+-EXPORT_SYMBOL(do_splice_from);
+ 
+ /*
+  * Attempt to initiate a splice from a file to a pipe.
+  */
+-long do_splice_to(struct file *in, loff_t *ppos,
+-		  struct pipe_inode_info *pipe, size_t len,
+-		  unsigned int flags)
++static long do_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);
+@@ -1154,7 +1155,6 @@ long do_splice_to(struct file *in, loff_t *ppos,
+ 
+ 	return splice_read(in, ppos, pipe, len, flags);
+ }
+-EXPORT_SYMBOL(do_splice_to);
+ 
+ /**
+  * splice_direct_to_actor - splices data directly between two non-pipes
+diff --git a/include/linux/splice.h b/include/linux/splice.h
+index 997c3b4..be9a153 100644
+--- a/include/linux/splice.h
++++ b/include/linux/splice.h
+@@ -89,10 +89,4 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *);
+ extern void splice_shrink_spd(struct pipe_inode_info *,
+ 				struct splice_pipe_desc *);
+ 
+-extern long do_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,
+-			 struct pipe_inode_info *pipe, size_t len,
+-			 unsigned int flags);
+-
+ #endif
+aufs2 standalone patch for linux-2.6.35
+
+diff --git a/security/security.c b/security/security.c
+index 351942a..6ba84a8 100644
+--- a/security/security.c
++++ b/security/security.c
+@@ -529,7 +539,6 @@ int security_inode_permission(struct inode *inode, int mask)
+ 		return 0;
+ 	return security_ops->inode_permission(inode, mask);
+ }
+-EXPORT_SYMBOL(security_inode_permission);
+ 
+ int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
+ {
+diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
+--- /usr/share/empty/fs/aufs/vfsub.c	1970-01-01 01:00:00.000000000 +0100
++++ linux/fs/aufs/vfsub.c	2010-08-21 21:00:02.986708041 +0200
+@@ -530,7 +530,7 @@
+ {
+ 	long err;
+ 
+-	err = do_splice_to(in, ppos, pipe, len, flags);
++	err = vfs_splice_to(in, ppos, pipe, len, flags);
+ 	file_accessed(in);
+ 	if (err >= 0)
+ 		vfsub_update_h_iattr(&in->f_path, /*did*/NULL); /*ignore*/
+@@ -542,7 +542,7 @@
+ {
+ 	long err;
+ 
+-	err = do_splice_from(pipe, out, ppos, len, flags);
++	err = vfs_splice_from(pipe, out, ppos, len, flags);
+ 	if (err >= 0)
+ 		vfsub_update_h_iattr(&out->f_path, /*did*/NULL); /*ignore*/
+ 	return err;
================================================================