Skip to content

Commit

Permalink
aufs3.16 standalone patch
Browse files Browse the repository at this point in the history
  • Loading branch information
sfjro authored and ppisa committed Aug 24, 2014
1 parent e8fa52e commit 12886cf
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 0 deletions.
2 changes: 2 additions & 0 deletions fs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ static struct hlist_head *inode_hashtable __read_mostly;
static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock);

__cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock);
EXPORT_SYMBOL(inode_sb_list_lock);

/*
* Empty aops. Can be used for the cases where the user does not
Expand Down Expand Up @@ -1512,6 +1513,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags)
mark_inode_dirty_sync(inode);
return 0;
}
EXPORT_SYMBOL(update_time);

/**
* touch_atime - update the access time
Expand Down
2 changes: 2 additions & 0 deletions fs/namespace.c
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,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
Expand Down Expand Up @@ -1564,6 +1565,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
}
return 0;
}
EXPORT_SYMBOL(iterate_mounts);

static void cleanup_group_ids(struct mount *mnt, struct mount *end)
{
Expand Down
4 changes: 4 additions & 0 deletions fs/notify/group.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -72,6 +73,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
{
atomic_inc(&group->refcnt);
}
EXPORT_SYMBOL(fsnotify_get_group);

/*
* Drop a reference to a group. Free it if it's through.
Expand All @@ -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(fsnotify_put_group);

/*
* Create a new fsnotify_group and hold a reference for the group returned.
Expand Down Expand Up @@ -109,6 +112,7 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)

return group;
}
EXPORT_SYMBOL(fsnotify_alloc_group);

int fsnotify_fasync(int fd, struct file *file, int on)
{
Expand Down
4 changes: 4 additions & 0 deletions fs/notify/mark.c
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
mark->free_mark(mark);
}
}
EXPORT_SYMBOL(fsnotify_put_mark);

/*
* Any time a mark is getting freed we end up here.
Expand Down Expand Up @@ -191,6 +192,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark,
fsnotify_destroy_mark_locked(mark, group);
mutex_unlock(&group->mark_mutex);
}
EXPORT_SYMBOL(fsnotify_destroy_mark);

void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask)
{
Expand Down Expand Up @@ -275,6 +277,7 @@ int fsnotify_add_mark_locked(struct fsnotify_mark *mark,

return ret;
}
EXPORT_SYMBOL(fsnotify_add_mark);

int fsnotify_add_mark(struct fsnotify_mark *mark, struct fsnotify_group *group,
struct inode *inode, struct vfsmount *mnt, int allow_dups)
Expand Down Expand Up @@ -336,6 +339,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
atomic_set(&mark->refcnt, 1);
mark->free_mark = free_mark;
}
EXPORT_SYMBOL(fsnotify_init_mark);

static int fsnotify_mark_destroy(void *ignored)
{
Expand Down
2 changes: 2 additions & 0 deletions fs/open.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,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(do_truncate);

long vfs_truncate(struct path *path, loff_t length)
{
Expand Down Expand Up @@ -298,6 +299,7 @@ int do_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
sb_end_write(inode->i_sb);
return ret;
}
EXPORT_SYMBOL(do_fallocate);

SYSCALL_DEFINE4(fallocate, int, fd, int, mode, loff_t, offset, loff_t, len)
{
Expand Down
2 changes: 2 additions & 0 deletions fs/splice.c
Original file line number Diff line number Diff line change
Expand Up @@ -1127,6 +1127,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,

return splice_write(pipe, out, ppos, len, flags);
}
EXPORT_SYMBOL(do_splice_from);

/*
* Attempt to initiate a splice from a file to a pipe.
Expand All @@ -1153,6 +1154,7 @@ long do_splice_to(struct file *in, loff_t *ppos,

return splice_read(in, ppos, pipe, len, flags);
}
EXPORT_SYMBOL(do_splice_to);

/**
* splice_direct_to_actor - splices data directly between two non-pipes
Expand Down
2 changes: 2 additions & 0 deletions security/commoncap.c
Original file line number Diff line number Diff line change
Expand Up @@ -988,9 +988,11 @@ int cap_mmap_addr(unsigned long addr)
}
return ret;
}
EXPORT_SYMBOL(cap_mmap_addr);

int cap_mmap_file(struct file *file, unsigned long reqprot,
unsigned long prot, unsigned long flags)
{
return 0;
}
EXPORT_SYMBOL(cap_mmap_file);
2 changes: 2 additions & 0 deletions security/device_cgroup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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(__devcgroup_inode_permission);

int devcgroup_inode_mknod(int mode, dev_t dev)
{
Expand Down
10 changes: 10 additions & 0 deletions security/security.c
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
return 0;
return security_ops->path_rmdir(dir, dentry);
}
EXPORT_SYMBOL(security_path_rmdir);

int security_path_unlink(struct path *dir, struct dentry *dentry)
{
Expand All @@ -423,6 +424,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
return 0;
return security_ops->path_symlink(dir, dentry, old_name);
}
EXPORT_SYMBOL(security_path_symlink);

int security_path_link(struct dentry *old_dentry, struct path *new_dir,
struct dentry *new_dentry)
Expand All @@ -431,6 +433,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,
Expand Down Expand Up @@ -458,20 +461,23 @@ int security_path_truncate(struct path *path)
return 0;
return security_ops->path_truncate(path);
}
EXPORT_SYMBOL(security_path_truncate);

int security_path_chmod(struct path *path, umode_t mode)
{
if (unlikely(IS_PRIVATE(path->dentry->d_inode)))
return 0;
return security_ops->path_chmod(path, mode);
}
EXPORT_SYMBOL(security_path_chmod);

int security_path_chown(struct path *path, kuid_t uid, kgid_t gid)
{
if (unlikely(IS_PRIVATE(path->dentry->d_inode)))
return 0;
return security_ops->path_chown(path, uid, gid);
}
EXPORT_SYMBOL(security_path_chown);

int security_path_chroot(struct path *path)
{
Expand Down Expand Up @@ -557,6 +563,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)
{
Expand All @@ -571,6 +578,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)
{
Expand Down Expand Up @@ -693,6 +701,7 @@ int security_file_permission(struct file *file, int mask)

return fsnotify_perm(file, mask);
}
EXPORT_SYMBOL(security_file_permission);

int security_file_alloc(struct file *file)
{
Expand Down Expand Up @@ -753,6 +762,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
return ret;
return ima_file_mmap(file, prot);
}
EXPORT_SYMBOL(security_mmap_file);

int security_mmap_addr(unsigned long addr)
{
Expand Down

0 comments on commit 12886cf

Please sign in to comment.