From 6631a3bf8ee2f15f2504656dba4d861098edf54a Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@canonical.com>
Date: Tue, 1 Jun 2010 14:10:55 +0100
Subject: [PATCH] UBUNTU: ubuntu: AUFS -- aufs2 base patch for linux-2.6.34

BugLink: http://bugs.launchpad.net/bugs/587888

Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 fs/namei.c             |    4 ++--
 fs/splice.c            |   10 +++++-----
 include/linux/namei.h  |    3 +++
 include/linux/splice.h |    6 ++++++
 ubuntu/Kconfig         |    4 ++++
 ubuntu/Makefile        |    4 ++++
 6 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index a4689eb..0513563 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1842,12 +1842,12 @@ out:
  * needs parent already locked. Doesn't follow mounts.
  * SMP-safe.
  */
-static struct dentry *lookup_hash(struct nameidata *nd)
+struct dentry *lookup_hash(struct nameidata *nd)
 {
 	return __lookup_hash(&nd->last, nd->path.dentry, nd);
 }
 
-static int __lookup_one_len(const char *name, struct qstr *this,
+int __lookup_one_len(const char *name, struct qstr *this,
 		struct dentry *base, int len)
 {
 	unsigned long hash;
diff --git a/fs/splice.c b/fs/splice.c
index 50a5d978..886e942 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -1081,8 +1081,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)
 {
 	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
 				loff_t *, size_t, unsigned int);
@@ -1109,9 +1109,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)
 {
 	ssize_t (*splice_read)(struct file *, loff_t *,
 			       struct pipe_inode_info *, size_t, unsigned int);
diff --git a/include/linux/namei.h b/include/linux/namei.h
index f276d4f..4eb5fcb 100644
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -79,6 +79,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
 extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
 		int (*open)(struct inode *, struct file *));
 
+extern struct dentry *lookup_hash(struct nameidata *nd);
+extern int __lookup_one_len(const char *name, struct qstr *this,
+			    struct dentry *base, int len);
 extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
 
 extern int follow_down_one(struct path *);
diff --git a/include/linux/splice.h b/include/linux/splice.h
index 997c3b4..5ae0b85 100644
--- a/include/linux/splice.h
+++ b/include/linux/splice.h
@@ -82,6 +82,12 @@ 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 *);
 
+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);
+
 /*
  * for dynamic pipe sizing
  */
diff --git a/ubuntu/Kconfig b/ubuntu/Kconfig
index 437a67e..e13b77f 100644
--- a/ubuntu/Kconfig
+++ b/ubuntu/Kconfig
@@ -35,6 +35,10 @@ source "ubuntu/rtl8192se/Kconfig"
 ##
 ##
 ##
+source "ubuntu/aufs/Kconfig"
+##
+##
+##
 ##
 ##
 ##
diff --git a/ubuntu/Makefile b/ubuntu/Makefile
index d335129..4dc54c6 100644
--- a/ubuntu/Makefile
+++ b/ubuntu/Makefile
@@ -37,6 +37,10 @@ obj-$(CONFIG_RTL8192SE)		+= rtl8192se/
 ##
 ##
 ##
+obj-$(CONFIG_AUFS_FS)		+= aufs/
+##
+##
+##
 ##
 ##
 ##
-- 
1.7.10.4