Revert "UBUNTU: ubuntu: AUFS -- aufs2-base.patch aufs2.1-36-UNRELEASED-20101103"

This reverts commit f628a4f95358f73b2393bec6c5a8df31b903e2ea.

Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/fs/namei.c b/fs/namei.c
index 0513563..a4689eb 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1842,12 +1842,12 @@ out:
  * needs parent already locked. Doesn't follow mounts.
  * SMP-safe.
  */
-struct dentry *lookup_hash(struct nameidata *nd)
+static struct dentry *lookup_hash(struct nameidata *nd)
 {
        return __lookup_hash(&nd->last, nd->path.dentry, nd);
 }
 
-int __lookup_one_len(const char *name, struct qstr *this,
+static 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 886e942..50a5d97 100644 (file)
--- 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.
  */
-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);
@@ -1109,9 +1109,9 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
 /*
  * 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);

diff --git a/include/linux/namei.h b/include/linux/namei.h
index 4eb5fcb..f276d4f 100644 (file)
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -79,9 +79,6 @@ 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 be9a153..997c3b4 100644 (file)
--- 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