Skip to content
Permalink
Browse files

merge: aufs-standalone

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  • Loading branch information...
RobertCNelson committed Oct 9, 2019
1 parent 2c2d095 commit 514d3625f84ce4e36bd2a23ff4c418f0cd3976d2
Showing with 41 additions and 0 deletions.
  1. +2 −0 fs/dcache.c
  2. +1 −0 fs/exec.c
  3. +1 −0 fs/fcntl.c
  4. +4 −0 fs/file_table.c
  5. +1 −0 fs/inode.c
  6. +3 −0 fs/namespace.c
  7. +3 −0 fs/notify/group.c
  8. +4 −0 fs/notify/mark.c
  9. +2 −0 fs/open.c
  10. +4 −0 fs/read_write.c
  11. +2 −0 fs/splice.c
  12. +1 −0 fs/sync.c
  13. +1 −0 fs/xattr.c
  14. +1 −0 kernel/locking/lockdep.c
  15. +1 −0 kernel/task_work.c
  16. +1 −0 security/device_cgroup.c
  17. +9 −0 security/security.c
@@ -1325,6 +1325,7 @@ void d_walk(struct dentry *parent, void *data,
seq = 1;
goto again;
}
EXPORT_SYMBOL_GPL(d_walk);

struct check_mount {
struct vfsmount *mnt;
@@ -2950,6 +2951,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)

write_sequnlock(&rename_lock);
}
EXPORT_SYMBOL_GPL(d_exchange);

/**
* d_ancestor - search for an ancestor
@@ -109,6 +109,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
/*
@@ -85,6 +85,7 @@ int setfl(int fd, struct file * filp, unsigned long arg)
out:
return error;
}
EXPORT_SYMBOL_GPL(setfl);

static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,
int force)
@@ -148,6 +148,7 @@ struct file *get_empty_filp(void)
}
return ERR_PTR(-ENFILE);
}
EXPORT_SYMBOL_GPL(get_empty_filp);

/**
* alloc_file - allocate and initialize a 'struct file'
@@ -258,6 +259,7 @@ void flush_delayed_fput(void)
{
delayed_fput(NULL);
}
EXPORT_SYMBOL_GPL(flush_delayed_fput);

static DECLARE_DELAYED_WORK(delayed_fput_work, delayed_fput);

@@ -300,6 +302,7 @@ void __fput_sync(struct file *file)
}

EXPORT_SYMBOL(fput);
EXPORT_SYMBOL_GPL(__fput_sync);

void put_filp(struct file *file)
{
@@ -308,6 +311,7 @@ void put_filp(struct file *file)
file_free(file);
}
}
EXPORT_SYMBOL_GPL(put_filp);

void __init files_init(void)
{
@@ -1665,6 +1665,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags)

return update_time(inode, time, flags);
}
EXPORT_SYMBOL_GPL(update_time);

/**
* touch_atime - update the access time
@@ -517,6 +517,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
@@ -860,6 +861,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)
{
return check_mnt(real_mount(mnt));
}
EXPORT_SYMBOL_GPL(is_current_mnt_ns);

/*
* vfsmount lock must be held for write
@@ -1924,6 +1926,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)
{
@@ -109,6 +109,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.
@@ -118,6 +119,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.
@@ -147,6 +149,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)
{
@@ -245,6 +245,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
queue_delayed_work(system_unbound_wq, &reaper_work,
FSNOTIFY_REAPER_DELAY);
}
EXPORT_SYMBOL_GPL(fsnotify_put_mark);

/*
* Get mark reference when we found the mark via lockless traversal of object
@@ -392,6 +393,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark,
mutex_unlock(&group->mark_mutex);
fsnotify_free_mark(mark);
}
EXPORT_SYMBOL_GPL(fsnotify_destroy_mark);

/*
* Sorting function for lists of fsnotify marks.
@@ -616,6 +618,7 @@ int fsnotify_add_mark(struct fsnotify_mark *mark, struct inode *inode,
mutex_unlock(&group->mark_mutex);
return ret;
}
EXPORT_SYMBOL_GPL(fsnotify_add_mark);

/*
* Given a list of marks, find the mark associated with given group. If found
@@ -739,6 +742,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
fsnotify_get_group(group);
mark->group = group;
}
EXPORT_SYMBOL_GPL(fsnotify_init_mark);

/*
* Destroy all marks in destroy_list, waits for SRCU period to finish before
@@ -64,6 +64,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
inode_unlock(dentry->d_inode);
return ret;
}
EXPORT_SYMBOL_GPL(do_truncate);

long vfs_truncate(const struct path *path, loff_t length)
{
@@ -691,6 +692,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,
@@ -454,6 +454,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)

return ret;
}
EXPORT_SYMBOL_GPL(vfs_read);

static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)
{
@@ -494,6 +495,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)
{
@@ -505,6 +507,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 void *buf, size_t count, loff_t *pos)
{
@@ -574,6 +577,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_

return ret;
}
EXPORT_SYMBOL_GPL(vfs_write);

static inline loff_t file_pos_read(struct file *file)
{
@@ -850,6 +850,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.
@@ -879,6 +880,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
@@ -39,6 +39,7 @@ int __sync_filesystem(struct super_block *sb, int wait)
sb->s_op->sync_fs(sb, wait);
return __sync_blockdev(sb->s_bdev, wait);
}
EXPORT_SYMBOL_GPL(__sync_filesystem);

/*
* Write out and wait upon all dirty data associated with this
@@ -297,6 +297,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
*xattr_value = value;
return error;
}
EXPORT_SYMBOL_GPL(vfs_getxattr_alloc);

ssize_t
__vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
@@ -154,6 +154,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
}
return lock_classes + hlock->class_idx - 1;
}
EXPORT_SYMBOL_GPL(lockdep_hlock_class);
#define hlock_class(hlock) lockdep_hlock_class(hlock)

#ifdef CONFIG_LOCK_STAT
@@ -116,3 +116,4 @@ void task_work_run(void)
} while (work);
}
}
EXPORT_SYMBOL_GPL(task_work_run);
@@ -850,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)
{
@@ -532,6 +532,7 @@ int security_path_rmdir(const 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(const struct path *dir, struct dentry *dentry)
{
@@ -548,6 +549,7 @@ int security_path_symlink(const 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, const struct path *new_dir,
struct dentry *new_dentry)
@@ -556,6 +558,7 @@ int security_path_link(struct dentry *old_dentry, const 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(const struct path *old_dir, struct dentry *old_dentry,
const struct path *new_dir, struct dentry *new_dentry,
@@ -583,20 +586,23 @@ int security_path_truncate(const struct path *path)
return 0;
return call_int_hook(path_truncate, 0, path);
}
EXPORT_SYMBOL_GPL(security_path_truncate);

int security_path_chmod(const struct path *path, umode_t mode)
{
if (unlikely(IS_PRIVATE(d_backing_inode(path->dentry))))
return 0;
return call_int_hook(path_chmod, 0, path, mode);
}
EXPORT_SYMBOL_GPL(security_path_chmod);

int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
{
if (unlikely(IS_PRIVATE(d_backing_inode(path->dentry))))
return 0;
return call_int_hook(path_chown, 0, path, uid, gid);
}
EXPORT_SYMBOL_GPL(security_path_chown);

int security_path_chroot(const struct path *path)
{
@@ -697,6 +703,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)
{
@@ -868,6 +875,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)
{
@@ -927,6 +935,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)
{

0 comments on commit 514d362

Please sign in to comment.
You can’t perform that action at this time.