342 lines
9.8 KiB
Diff
342 lines
9.8 KiB
Diff
From: J. R. Okajima <hooanon05@yahoo.co.jp>
|
|
Date: Fri Nov 6 10:26:35 2015 +0900
|
|
Subject: aufs4.3 standalone patch
|
|
Origin: https://github.com/sfjro/aufs4-standalone/tree/d376e884b0bb6d059bf616443042a016b26326a8
|
|
Bug-Debian: https://bugs.debian.org/541828
|
|
|
|
Patch headers added by debian/patches/features/all/aufs4/gen-patch
|
|
|
|
aufs4.3 standalone patch
|
|
|
|
diff --git a/fs/dcache.c b/fs/dcache.c
|
|
index 8aa7f26..f997345 100644
|
|
--- a/fs/dcache.c
|
|
+++ b/fs/dcache.c
|
|
@@ -1272,6 +1272,7 @@ rename_retry:
|
|
seq = 1;
|
|
goto again;
|
|
}
|
|
+EXPORT_SYMBOL_GPL(d_walk);
|
|
|
|
/*
|
|
* Search for at least 1 mount point in the dentry's subdirs.
|
|
diff --git a/fs/exec.c b/fs/exec.c
|
|
index b06623a..b9206c5 100644
|
|
--- a/fs/exec.c
|
|
+++ b/fs/exec.c
|
|
@@ -103,6 +103,7 @@ bool path_noexec(const struct path *path)
|
|
return (path->mnt->mnt_flags & MNT_NOEXEC) ||
|
|
(path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
|
|
}
|
|
+EXPORT_SYMBOL_GPL(path_noexec);
|
|
|
|
#ifdef CONFIG_USELIB
|
|
/*
|
|
diff --git a/fs/file_table.c b/fs/file_table.c
|
|
index ad17e05..df66450 100644
|
|
--- a/fs/file_table.c
|
|
+++ b/fs/file_table.c
|
|
@@ -147,6 +147,7 @@ over:
|
|
}
|
|
return ERR_PTR(-ENFILE);
|
|
}
|
|
+EXPORT_SYMBOL_GPL(get_empty_filp);
|
|
|
|
/**
|
|
* alloc_file - allocate and initialize a 'struct file'
|
|
@@ -308,6 +309,7 @@ void put_filp(struct file *file)
|
|
file_free(file);
|
|
}
|
|
}
|
|
+EXPORT_SYMBOL_GPL(put_filp);
|
|
|
|
void __init files_init(void)
|
|
{
|
|
diff --git a/fs/namespace.c b/fs/namespace.c
|
|
index 0570729..ec560d8 100644
|
|
--- a/fs/namespace.c
|
|
+++ b/fs/namespace.c
|
|
@@ -463,6 +463,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
|
|
mnt_dec_writers(real_mount(mnt));
|
|
preempt_enable();
|
|
}
|
|
+EXPORT_SYMBOL_GPL(__mnt_drop_write);
|
|
|
|
/**
|
|
* mnt_drop_write - give up write access to a mount
|
|
@@ -1803,6 +1804,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
|
|
}
|
|
return 0;
|
|
}
|
|
+EXPORT_SYMBOL_GPL(iterate_mounts);
|
|
|
|
static void cleanup_group_ids(struct mount *mnt, struct mount *end)
|
|
{
|
|
diff --git a/fs/notify/group.c b/fs/notify/group.c
|
|
index d16b62c..06ca6bc 100644
|
|
--- a/fs/notify/group.c
|
|
+++ b/fs/notify/group.c
|
|
@@ -22,6 +22,7 @@
|
|
#include <linux/srcu.h>
|
|
#include <linux/rculist.h>
|
|
#include <linux/wait.h>
|
|
+#include <linux/module.h>
|
|
|
|
#include <linux/fsnotify_backend.h>
|
|
#include "fsnotify.h"
|
|
@@ -72,6 +73,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
|
|
{
|
|
atomic_inc(&group->refcnt);
|
|
}
|
|
+EXPORT_SYMBOL_GPL(fsnotify_get_group);
|
|
|
|
/*
|
|
* Drop a reference to a group. Free it if it's through.
|
|
@@ -81,6 +83,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
|
|
if (atomic_dec_and_test(&group->refcnt))
|
|
fsnotify_final_destroy_group(group);
|
|
}
|
|
+EXPORT_SYMBOL_GPL(fsnotify_put_group);
|
|
|
|
/*
|
|
* Create a new fsnotify_group and hold a reference for the group returned.
|
|
@@ -109,6 +112,7 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
|
|
|
|
return group;
|
|
}
|
|
+EXPORT_SYMBOL_GPL(fsnotify_alloc_group);
|
|
|
|
int fsnotify_fasync(int fd, struct file *file, int on)
|
|
{
|
|
diff --git a/fs/notify/mark.c b/fs/notify/mark.c
|
|
index fc0df44..325b5c6 100644
|
|
--- a/fs/notify/mark.c
|
|
+++ b/fs/notify/mark.c
|
|
@@ -109,6 +109,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
|
|
mark->free_mark(mark);
|
|
}
|
|
}
|
|
+EXPORT_SYMBOL_GPL(fsnotify_put_mark);
|
|
|
|
/* Calculate mask of events for a list of marks */
|
|
u32 fsnotify_recalc_mask(struct hlist_head *head)
|
|
@@ -208,6 +209,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark,
|
|
mutex_unlock(&group->mark_mutex);
|
|
fsnotify_free_mark(mark);
|
|
}
|
|
+EXPORT_SYMBOL_GPL(fsnotify_destroy_mark);
|
|
|
|
void fsnotify_destroy_marks(struct hlist_head *head, spinlock_t *lock)
|
|
{
|
|
@@ -392,6 +394,7 @@ err:
|
|
|
|
return ret;
|
|
}
|
|
+EXPORT_SYMBOL_GPL(fsnotify_add_mark);
|
|
|
|
int fsnotify_add_mark(struct fsnotify_mark *mark, struct fsnotify_group *group,
|
|
struct inode *inode, struct vfsmount *mnt, int allow_dups)
|
|
@@ -492,6 +495,7 @@ 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 b6f1e96..4ab0d4e 100644
|
|
--- a/fs/open.c
|
|
+++ b/fs/open.c
|
|
@@ -64,6 +64,7 @@ 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);
|
|
|
|
long vfs_truncate(struct path *path, loff_t length)
|
|
{
|
|
@@ -678,6 +679,7 @@ int open_check_o_direct(struct file *f)
|
|
}
|
|
return 0;
|
|
}
|
|
+EXPORT_SYMBOL_GPL(open_check_o_direct);
|
|
|
|
static int do_dentry_open(struct file *f,
|
|
struct inode *inode,
|
|
diff --git a/fs/read_write.c b/fs/read_write.c
|
|
index fd0414e..8ace6ec 100644
|
|
--- a/fs/read_write.c
|
|
+++ b/fs/read_write.c
|
|
@@ -504,6 +504,7 @@ vfs_readf_t vfs_readf(struct file *file)
|
|
return new_sync_read;
|
|
return ERR_PTR(-ENOSYS);
|
|
}
|
|
+EXPORT_SYMBOL_GPL(vfs_readf);
|
|
|
|
vfs_writef_t vfs_writef(struct file *file)
|
|
{
|
|
@@ -515,6 +516,7 @@ vfs_writef_t vfs_writef(struct file *file)
|
|
return new_sync_write;
|
|
return ERR_PTR(-ENOSYS);
|
|
}
|
|
+EXPORT_SYMBOL_GPL(vfs_writef);
|
|
|
|
ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t *pos)
|
|
{
|
|
diff --git a/fs/splice.c b/fs/splice.c
|
|
index 5f8385a..f76067e 100644
|
|
--- a/fs/splice.c
|
|
+++ b/fs/splice.c
|
|
@@ -1115,6 +1115,7 @@ 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.
|
|
@@ -1141,6 +1142,7 @@ 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/xattr.c b/fs/xattr.c
|
|
index 072fee1..a7677af 100644
|
|
--- a/fs/xattr.c
|
|
+++ b/fs/xattr.c
|
|
@@ -207,6 +207,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
|
|
*xattr_value = value;
|
|
return error;
|
|
}
|
|
+EXPORT_SYMBOL_GPL(vfs_getxattr_alloc);
|
|
|
|
/* Compare an extended attribute value with the given value */
|
|
int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
|
|
diff --git a/security/commoncap.c b/security/commoncap.c
|
|
index 1832cf7..987ff5f 100644
|
|
--- a/security/commoncap.c
|
|
+++ b/security/commoncap.c
|
|
@@ -1053,12 +1053,14 @@ int cap_mmap_addr(unsigned long addr)
|
|
}
|
|
return ret;
|
|
}
|
|
+EXPORT_SYMBOL_GPL(cap_mmap_addr);
|
|
|
|
int cap_mmap_file(struct file *file, unsigned long reqprot,
|
|
unsigned long prot, unsigned long flags)
|
|
{
|
|
return 0;
|
|
}
|
|
+EXPORT_SYMBOL_GPL(cap_mmap_file);
|
|
|
|
#ifdef CONFIG_SECURITY
|
|
|
|
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
|
|
index 03c1652..b00aa76 100644
|
|
--- a/security/device_cgroup.c
|
|
+++ b/security/device_cgroup.c
|
|
@@ -7,6 +7,7 @@
|
|
#include <linux/device_cgroup.h>
|
|
#include <linux/cgroup.h>
|
|
#include <linux/ctype.h>
|
|
+#include <linux/export.h>
|
|
#include <linux/list.h>
|
|
#include <linux/uaccess.h>
|
|
#include <linux/seq_file.h>
|
|
@@ -849,6 +850,7 @@ int __devcgroup_inode_permission(struct inode *inode, int mask)
|
|
return __devcgroup_check_permission(type, imajor(inode), iminor(inode),
|
|
access);
|
|
}
|
|
+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 46f405c..54488b0 100644
|
|
--- a/security/security.c
|
|
+++ b/security/security.c
|
|
@@ -433,6 +433,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
|
|
return 0;
|
|
return call_int_hook(path_rmdir, 0, dir, dentry);
|
|
}
|
|
+EXPORT_SYMBOL_GPL(security_path_rmdir);
|
|
|
|
int security_path_unlink(struct path *dir, struct dentry *dentry)
|
|
{
|
|
@@ -449,6 +450,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
|
|
return 0;
|
|
return call_int_hook(path_symlink, 0, 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)
|
|
@@ -457,6 +459,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
|
|
return 0;
|
|
return call_int_hook(path_link, 0, 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,
|
|
@@ -484,6 +487,7 @@ int security_path_truncate(struct path *path)
|
|
return 0;
|
|
return call_int_hook(path_truncate, 0, path);
|
|
}
|
|
+EXPORT_SYMBOL_GPL(security_path_truncate);
|
|
|
|
int security_path_chmod(struct path *path, umode_t mode)
|
|
{
|
|
@@ -491,6 +495,7 @@ int security_path_chmod(struct path *path, umode_t mode)
|
|
return 0;
|
|
return call_int_hook(path_chmod, 0, path, mode);
|
|
}
|
|
+EXPORT_SYMBOL_GPL(security_path_chmod);
|
|
|
|
int security_path_chown(struct path *path, kuid_t uid, kgid_t gid)
|
|
{
|
|
@@ -498,6 +503,7 @@ int security_path_chown(struct path *path, kuid_t uid, kgid_t gid)
|
|
return 0;
|
|
return call_int_hook(path_chown, 0, path, uid, gid);
|
|
}
|
|
+EXPORT_SYMBOL_GPL(security_path_chown);
|
|
|
|
int security_path_chroot(struct path *path)
|
|
{
|
|
@@ -583,6 +589,7 @@ int security_inode_readlink(struct dentry *dentry)
|
|
return 0;
|
|
return call_int_hook(inode_readlink, 0, dentry);
|
|
}
|
|
+EXPORT_SYMBOL_GPL(security_inode_readlink);
|
|
|
|
int security_inode_follow_link(struct dentry *dentry, struct inode *inode,
|
|
bool rcu)
|
|
@@ -598,6 +605,7 @@ int security_inode_permission(struct inode *inode, int mask)
|
|
return 0;
|
|
return call_int_hook(inode_permission, 0, inode, mask);
|
|
}
|
|
+EXPORT_SYMBOL_GPL(security_inode_permission);
|
|
|
|
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
|
|
{
|
|
@@ -736,6 +744,7 @@ 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)
|
|
{
|
|
@@ -795,6 +804,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
|
|
return ret;
|
|
return ima_file_mmap(file, prot);
|
|
}
|
|
+EXPORT_SYMBOL_GPL(security_mmap_file);
|
|
|
|
int security_mmap_addr(unsigned long addr)
|
|
{
|