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

This reverts commit 39e47347774cd894b19cb173770081473c97e2c2.

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

diff --git a/fs/file_table.c b/fs/file_table.c
index 1ead879..eb36b6b 100644 (file)
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -393,8 +393,6 @@ void file_sb_list_del(struct file *file)
        }
 }
 
-EXPORT_SYMBOL_GPL(file_sb_list_del);
-
 #ifdef CONFIG_SMP
 
 /*

diff --git a/fs/inode.c b/fs/inode.c
index 1c124c7..27830fa 100644 (file)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -82,7 +82,6 @@ static struct hlist_head *inode_hashtable __read_mostly;
  * the i_state of an inode while it is in use..
  */
 DEFINE_SPINLOCK(inode_lock);
-EXPORT_SYMBOL_GPL(inode_lock);
 
 /*
  * iprune_sem provides exclusion between the kswapd or try_to_free_pages

diff --git a/fs/namei.c b/fs/namei.c
index 9d595f8..0513563 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -353,7 +353,6 @@ int deny_write_access(struct file * file)
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(deny_write_access);
 
 /**
  * path_get - get a reference to a path
@@ -1847,7 +1846,6 @@ struct dentry *lookup_hash(struct nameidata *nd)
 {
        return __lookup_hash(&nd->last, nd->path.dentry, nd);
 }
-EXPORT_SYMBOL_GPL(lookup_hash);
 
 int __lookup_one_len(const char *name, struct qstr *this,
                struct dentry *base, int len)
@@ -1870,7 +1868,6 @@ int __lookup_one_len(const char *name, struct qstr *this,
        this->hash = end_name_hash(hash);
        return 0;
 }
-EXPORT_SYMBOL_GPL(__lookup_one_len);
 
 /**
  * lookup_one_len - filesystem helper to lookup single pathname component

diff --git a/fs/namespace.c b/fs/namespace.c
index 9787fca..445534b 100644 (file)
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1465,7 +1465,6 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
        }
        return 0;
 }
-EXPORT_SYMBOL_GPL(iterate_mounts);
 
 static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end)
 {

diff --git a/fs/notify/group.c b/fs/notify/group.c
index b71137d..d309f38 100644 (file)
--- a/fs/notify/group.c
+++ b/fs/notify/group.c
@@ -22,7 +22,6 @@
 #include <linux/srcu.h>
 #include <linux/rculist.h>
 #include <linux/wait.h>
-#include <linux/module.h>
 
 #include <linux/fsnotify_backend.h>
 #include "fsnotify.h"
@@ -71,7 +70,6 @@ void fsnotify_put_group(struct fsnotify_group *group)
        if (atomic_dec_and_test(&group->refcnt))
                fsnotify_destroy_group(group);
 }
-EXPORT_SYMBOL_GPL(fsnotify_put_group);
 
 /*
  * Create a new fsnotify_group and hold a reference for the group returned.
@@ -104,4 +102,3 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
 
        return group;
 }
-EXPORT_SYMBOL_GPL(fsnotify_alloc_group);

diff --git a/fs/notify/mark.c b/fs/notify/mark.c
index 9e69004..325185e 100644 (file)
--- a/fs/notify/mark.c
+++ b/fs/notify/mark.c
@@ -113,7 +113,6 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
        if (atomic_dec_and_test(&mark->refcnt))
                mark->free_mark(mark);
 }
-EXPORT_SYMBOL_GPL(fsnotify_put_mark);
 
 /*
  * Any time a mark is getting freed we end up here.
@@ -191,7 +190,6 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark)
        if (unlikely(atomic_dec_and_test(&group->num_marks)))
                fsnotify_final_destroy_group(group);
 }
-EXPORT_SYMBOL_GPL(fsnotify_destroy_mark);
 
 void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask)
 {
@@ -279,7 +277,6 @@ err:
 
        return ret;
 }
-EXPORT_SYMBOL_GPL(fsnotify_add_mark);
 
 /*
  * clear any marks in a group in which mark->flags & flags is true
@@ -335,7 +332,6 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
        atomic_set(&mark->refcnt, 1);
        mark->free_mark = free_mark;
 }
-EXPORT_SYMBOL_GPL(fsnotify_init_mark);
 
 static int fsnotify_mark_destroy(void *ignored)
 {

diff --git a/fs/open.c b/fs/open.c
index ba6553f..425837c 100644 (file)
--- a/fs/open.c
+++ b/fs/open.c
@@ -63,7 +63,6 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
        mutex_unlock(&dentry->d_inode->i_mutex);
        return ret;
 }
-EXPORT_SYMBOL_GPL(do_truncate);
 
 static long do_sys_truncate(const char __user *pathname, loff_t length)
 {

diff --git a/fs/splice.c b/fs/splice.c
index 3dedc5e..886e942 100644 (file)
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -1105,7 +1105,6 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
 
        return splice_write(pipe, out, ppos, len, flags);
 }
-EXPORT_SYMBOL_GPL(do_splice_from);
 
 /*
  * Attempt to initiate a splice from a file to a pipe.
@@ -1132,7 +1131,6 @@ long do_splice_to(struct file *in, loff_t *ppos,
 
        return splice_read(in, ppos, pipe, len, flags);
 }
-EXPORT_SYMBOL_GPL(do_splice_to);
 
 /**
  * splice_direct_to_actor - splices data directly between two non-pipes

diff --git a/fs/statfs.c b/fs/statfs.c
index dbd6080..30ea8c8 100644 (file)
--- a/fs/statfs.c
+++ b/fs/statfs.c
@@ -61,7 +61,6 @@ int statfs_by_dentry(struct dentry *dentry, struct kstatfs *buf)
                buf->f_frsize = buf->f_bsize;
        return retval;
 }
-EXPORT_SYMBOL_GPL(statfs_by_dentry);
 
 int vfs_statfs(struct path *path, struct kstatfs *buf)
 {

diff --git a/security/commoncap.c b/security/commoncap.c
index 506808a..64c2ed9 100644 (file)
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -929,4 +929,3 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
        }
        return ret;
 }
-EXPORT_SYMBOL_GPL(cap_file_mmap);

diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 31b30f8..8d9c48f 100644 (file)
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -515,7 +515,6 @@ found:
 
        return -EPERM;
 }
-EXPORT_SYMBOL_GPL(devcgroup_inode_permission);
 
 int devcgroup_inode_mknod(int mode, dev_t dev)
 {

diff --git a/security/security.c b/security/security.c
index 622c7a7..7ed5b8b 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -377,7 +377,6 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode)
                return 0;
        return security_ops->path_mkdir(dir, dentry, mode);
 }
-EXPORT_SYMBOL_GPL(security_path_mkdir);
 
 int security_path_rmdir(struct path *dir, struct dentry *dentry)
 {
@@ -385,7 +384,6 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
                return 0;
        return security_ops->path_rmdir(dir, dentry);
 }
-EXPORT_SYMBOL_GPL(security_path_rmdir);
 
 int security_path_unlink(struct path *dir, struct dentry *dentry)
 {
@@ -393,7 +391,6 @@ int security_path_unlink(struct path *dir, struct dentry *dentry)
                return 0;
        return security_ops->path_unlink(dir, dentry);
 }
-EXPORT_SYMBOL_GPL(security_path_unlink);
 
 int security_path_symlink(struct path *dir, struct dentry *dentry,
                          const char *old_name)
@@ -402,7 +399,6 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
                return 0;
        return security_ops->path_symlink(dir, dentry, old_name);
 }
-EXPORT_SYMBOL_GPL(security_path_symlink);
 
 int security_path_link(struct dentry *old_dentry, struct path *new_dir,
                       struct dentry *new_dentry)
@@ -416,7 +412,6 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
 #endif
        return security_ops->path_link(old_dentry, new_dir, new_dentry);
 }
-EXPORT_SYMBOL_GPL(security_path_link);
 
 int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
                         struct path *new_dir, struct dentry *new_dentry)
@@ -427,7 +422,6 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
        return security_ops->path_rename(old_dir, old_dentry, new_dir,
                                         new_dentry);
 }
-EXPORT_SYMBOL_GPL(security_path_rename);
 
 int security_path_truncate(struct path *path)
 {
@@ -435,7 +429,6 @@ int security_path_truncate(struct path *path)
                return 0;
        return security_ops->path_truncate(path);
 }
-EXPORT_SYMBOL_GPL(security_path_truncate);
 
 int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
                        mode_t mode)
@@ -444,7 +437,6 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
                return 0;
        return security_ops->path_chmod(dentry, mnt, mode);
 }
-EXPORT_SYMBOL_GPL(security_path_chmod);
 
 int security_path_chown(struct path *path, uid_t uid, gid_t gid)
 {
@@ -452,7 +444,6 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
                return 0;
        return security_ops->path_chown(path, uid, gid);
 }
-EXPORT_SYMBOL_GPL(security_path_chown);
 
 int security_path_chroot(struct path *path)
 {
@@ -529,7 +520,6 @@ int security_inode_readlink(struct dentry *dentry)
                return 0;
        return security_ops->inode_readlink(dentry);
 }
-EXPORT_SYMBOL_GPL(security_inode_readlink);
 
 int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
@@ -549,7 +539,6 @@ int security_inode_permission(struct inode *inode, int mask)
                return 0;
        return security_ops->inode_permission(inode, mask);
 }
-EXPORT_SYMBOL_GPL(security_inode_permission);
 
 int security_inode_exec_permission(struct inode *inode, unsigned int flags)
 {
@@ -658,7 +647,6 @@ int security_file_permission(struct file *file, int mask)
 
        return fsnotify_perm(file, mask);
 }
-EXPORT_SYMBOL_GPL(security_file_permission);
 
 int security_file_alloc(struct file *file)
 {
@@ -686,7 +674,6 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
                return ret;
        return ima_file_mmap(file, prot);
 }
-EXPORT_SYMBOL_GPL(security_file_mmap);
 
 int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
                            unsigned long prot)