summaryrefslogtreecommitdiff
path: root/patches/aufs2-standalone-20090611.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/aufs2-standalone-20090611.patch')
-rw-r--r--patches/aufs2-standalone-20090611.patch259
1 files changed, 0 insertions, 259 deletions
diff --git a/patches/aufs2-standalone-20090611.patch b/patches/aufs2-standalone-20090611.patch
deleted file mode 100644
index 395dbec..0000000
--- a/patches/aufs2-standalone-20090611.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-aufs2 standalone patch for linux-2.6.
-
-diff --git a/fs/namei.c b/fs/namei.c
-index 967c3db..64a5060 100644
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -337,6 +337,7 @@ int deny_write_access(struct file * file)
-
- return 0;
- }
-+EXPORT_SYMBOL(deny_write_access);
-
- /**
- * path_get - get a reference to a path
-@@ -1200,7 +1201,7 @@ 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)
- {
- int err;
-
-@@ -1209,8 +1210,9 @@ static struct dentry *lookup_hash(struct nameidata *nd)
- return ERR_PTR(err);
- return __lookup_hash(&nd->last, nd->path.dentry, nd);
- }
-+EXPORT_SYMBOL(lookup_hash);
-
--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;
-@@ -1231,6 +1233,7 @@ static int __lookup_one_len(const char *name, struct qstr *this,
- this->hash = end_name_hash(hash);
- return 0;
- }
-+EXPORT_SYMBOL(__lookup_one_len);
-
- /**
- * lookup_one_len - filesystem helper to lookup single pathname component
-diff --git a/fs/namespace.c b/fs/namespace.c
-index 134d494..7cd1919 100644
---- a/fs/namespace.c
-+++ b/fs/namespace.c
-@@ -38,6 +38,9 @@
-
- /* spinlock for vfsmount related operations, inplace of dcache_lock */
- __cacheline_aligned_in_smp DEFINE_SPINLOCK(vfsmount_lock);
-+#ifdef CONFIG_AUFS_EXPORT
-+EXPORT_SYMBOL(vfsmount_lock);
-+#endif
-
- static int event;
- static DEFINE_IDA(mnt_id_ida);
-diff --git a/fs/open.c b/fs/open.c
-index bdfbf03..81c39b3 100644
---- a/fs/open.c
-+++ b/fs/open.c
-@@ -221,6 +221,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
- mutex_unlock(&dentry->d_inode->i_mutex);
- return err;
- }
-+EXPORT_SYMBOL(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 666953d..fbc3f77 100644
---- a/fs/splice.c
-+++ b/fs/splice.c
-@@ -905,8 +905,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)
- {
- int ret;
-
-@@ -925,13 +925,14 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
-
- return out->f_op->splice_write(pipe, out, ppos, len, flags);
- }
-+EXPORT_SYMBOL(do_splice_from);
-
- /*
- * 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)
- {
- int ret;
-
-@@ -947,6 +948,7 @@ static long do_splice_to(struct file *in, loff_t *ppos,
-
- return in->f_op->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/lockdep.h b/include/linux/lockdep.h
-index da5a5a1..261b136 100644
---- a/include/linux/lockdep.h
-+++ b/include/linux/lockdep.h
-@@ -25,7 +25,7 @@ struct lockdep_map;
- */
- #define XXX_LOCK_USAGE_STATES (1+3*4)
-
--#define MAX_LOCKDEP_SUBCLASSES 8UL
-+#define MAX_LOCKDEP_SUBCLASSES 12UL
-
- /*
- * Lock-classes are keyed via unique addresses, by embedding the
-diff --git a/include/linux/namei.h b/include/linux/namei.h
-index 518098f..42a5279 100644
---- a/include/linux/namei.h
-+++ b/include/linux/namei.h
-@@ -74,6 +74,9 @@ extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry
- extern struct file *nameidata_to_filp(struct nameidata *nd, int flags);
- extern void release_open_intent(struct nameidata *);
-
-+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 struct dentry *lookup_one_noperm(const char *, struct dentry *);
-
-diff --git a/include/linux/splice.h b/include/linux/splice.h
-index 5f3faa9..d2f8660 100644
---- a/include/linux/splice.h
-+++ b/include/linux/splice.h
-@@ -83,4 +83,10 @@ 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);
-+
- #endif
-diff --git a/security/device_cgroup.c b/security/device_cgroup.c
-index 5fda7df..440e476 100644
---- a/security/device_cgroup.c
-+++ b/security/device_cgroup.c
-@@ -512,6 +512,7 @@ acc_check:
-
- return -EPERM;
- }
-+EXPORT_SYMBOL(devcgroup_inode_permission);
-
- int devcgroup_inode_mknod(int mode, dev_t dev)
- {
-diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
-index f4e7266..2a0d58a 100644
---- a/security/integrity/ima/ima_main.c
-+++ b/security/integrity/ima/ima_main.c
-@@ -206,6 +206,7 @@ out:
- kref_put(&iint->refcount, iint_free);
- return 0;
- }
-+EXPORT_SYMBOL(ima_path_check);
-
- static int process_measurement(struct file *file, const unsigned char *filename,
- int mask, int function)
-@@ -271,6 +272,7 @@ int ima_file_mmap(struct file *file, unsigned long prot)
- MAY_EXEC, FILE_MMAP);
- return 0;
- }
-+EXPORT_SYMBOL(ima_file_mmap);
-
- /*
- * ima_shm_check - IPC shm and shmat create/fput a file
-diff --git a/security/security.c b/security/security.c
-index 5284255..62a2392 100644
---- a/security/security.c
-+++ b/security/security.c
-@@ -389,6 +389,7 @@ int security_path_mkdir(struct path *path, struct dentry *dentry, int mode)
- return 0;
- return security_ops->path_mkdir(path, dentry, mode);
- }
-+EXPORT_SYMBOL(security_path_mkdir);
-
- int security_path_rmdir(struct path *path, struct dentry *dentry)
- {
-@@ -396,6 +397,7 @@ int security_path_rmdir(struct path *path, struct dentry *dentry)
- return 0;
- return security_ops->path_rmdir(path, dentry);
- }
-+EXPORT_SYMBOL(security_path_rmdir);
-
- int security_path_unlink(struct path *path, struct dentry *dentry)
- {
-@@ -403,6 +405,7 @@ int security_path_unlink(struct path *path, struct dentry *dentry)
- return 0;
- return security_ops->path_unlink(path, dentry);
- }
-+EXPORT_SYMBOL(security_path_unlink);
-
- int security_path_symlink(struct path *path, struct dentry *dentry,
- const char *old_name)
-@@ -411,6 +414,7 @@ int security_path_symlink(struct path *path, struct dentry *dentry,
- return 0;
- return security_ops->path_symlink(path, dentry, old_name);
- }
-+EXPORT_SYMBOL(security_path_symlink);
-
- int security_path_link(struct dentry *old_dentry, struct path *new_dir,
- struct dentry *new_dentry)
-@@ -419,6 +423,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
- return 0;
- return security_ops->path_link(old_dentry, new_dir, new_dentry);
- }
-+EXPORT_SYMBOL(security_path_link);
-
- int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
- struct path *new_dir, struct dentry *new_dentry)
-@@ -429,6 +434,7 @@ 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(security_path_rename);
-
- int security_path_truncate(struct path *path, loff_t length,
- unsigned int time_attrs)
-@@ -437,6 +443,7 @@ int security_path_truncate(struct path *path, loff_t length,
- return 0;
- return security_ops->path_truncate(path, length, time_attrs);
- }
-+EXPORT_SYMBOL(security_path_truncate);
- #endif
-
- int security_inode_create(struct inode *dir, struct dentry *dentry, int mode)
-@@ -508,6 +515,7 @@ int security_inode_readlink(struct dentry *dentry)
- return 0;
- return security_ops->inode_readlink(dentry);
- }
-+EXPORT_SYMBOL(security_inode_readlink);
-
- int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
- {
-@@ -522,6 +530,7 @@ 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)
- {