AUFS fixes for 2.6.24-zen5

diff --git a/fs/aufs/Kconfig b/fs/aufs/Kconfigindex 7d1d113..71dd12a 100644--- a/fs/aufs/Kconfig+++ b/fs/aufs/Kconfig@@ -123,10 +123,6 @@ config AUFS_SEC_PERM_PATCH 	depends on AUFS = m 	depends on SECURITY 	default y-config AUFS_SPLICE_PATCH-	bool-	depends on AUFS-	default y config AUFS_PUT_FILP_PATCH 	bool 	depends on AUFS = m@@ -141,7 +137,7 @@ config AUFS_LHASH_PATCH config AUFS_DENY_WRITE_ACCESS_PATCH 	bool 	depends on AUFS = m-	default y+	default n config AUFS_SYSFS_GET_DENTRY_PATCH 	bool "Show the amount of kernel memory allocated in /sys/fs/aufs" 	depends on AUFS_SYSAUFSdiff --git a/fs/splice.c b/fs/splice.cindex 581d3f0..61e07dc 100644--- a/fs/splice.c+++ b/fs/splice.c@@ -893,10 +893,9 @@ EXPORT_SYMBOL(generic_splice_sendpage); /*  * Attempt to initiate a splice from pipe to file.  */-#ifdef CONFIG_AUFS_SPLICE_PATCH long do_splice_from(struct pipe_inode_info *pipe, struct file *out, 			   loff_t *ppos, size_t len, unsigned int flags)-#else+#if 0 static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, 			   loff_t *ppos, size_t len, unsigned int flags) #endif@@ -919,18 +918,15 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,  	return out->f_op->splice_write(pipe, out, ppos, len, flags); }-#ifdef CONFIG_AUFS_SPLICE_PATCH EXPORT_SYMBOL(do_splice_from);-#endif  /*  * Attempt to initiate a splice from a file to a pipe.  */-#ifdef CONFIG_AUFS_SPLICE_PATCH long do_splice_to(struct file *in, loff_t *ppos, 			 struct pipe_inode_info *pipe, size_t len, 			 unsigned int flags)-#else+#if 0 static long do_splice_to(struct file *in, loff_t *ppos, 			 struct pipe_inode_info *pipe, size_t len, 			 unsigned int flags)@@ -954,9 +950,7 @@ static long do_splice_to(struct file *in, loff_t *ppos,  	return in->f_op->splice_read(in, ppos, pipe, len, flags); }-#ifdef CONFIG_AUFS_SPLICE_PATCH EXPORT_SYMBOL(do_splice_to);-#endif  /**  * splice_direct_to_actor - splices data directly between two non-pipesdiff --git a/include/linux/splice.h b/include/linux/splice.hindex 7846e83..d5cd3b9 100644--- a/include/linux/splice.h+++ b/include/linux/splice.h@@ -70,11 +70,9 @@ extern ssize_t splice_to_pipe(struct pipe_inode_info *, extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *, 				      splice_direct_actor *); -#ifdef CONFIG_AUFS_SPLICE_PATCH 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-#endif