From f2a0d6dbc37bed1702795eeea69221a8b5fb0b32 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 17 Nov 2015 14:57:05 +0000 Subject: [PATCH] aufs: Update support patches to aufs4.3-20151116 --- debian/changelog | 1 + .../features/all/aufs4/aufs4-base.patch | 22 ++-- .../features/all/aufs4/aufs4-mmap.patch | 80 +++++++++----- .../features/all/aufs4/aufs4-standalone.patch | 102 ++++++++++++------ 4 files changed, 134 insertions(+), 71 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5eca6d368..e595294e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ linux (4.3-1~exp2) UNRELEASED; urgency=medium - musb: Enable USB_MUSB_SUNXI as module * [armhf] udeb: Add stmmac platform modules dwmac-generic, dwmac-socfpga and dwmac-sunxi to nic-modules (Closes: #805098) + * aufs: Update support patches to aufs4.3-20151116 [ Ian Campbell ] * [armel/orion5x] Enable Device Tree for orion5x. Patch from Roger Shimizu diff --git a/debian/patches/features/all/aufs4/aufs4-base.patch b/debian/patches/features/all/aufs4/aufs4-base.patch index 03e7aca84..20af8b71a 100644 --- a/debian/patches/features/all/aufs4/aufs4-base.patch +++ b/debian/patches/features/all/aufs4/aufs4-base.patch @@ -1,18 +1,18 @@ From: J. R. Okajima -Date: Sat Sep 19 06:24:59 2015 +0900 -Subject: aufs4.x-rcN base patch -Origin: https://github.com/sfjro/aufs4-standalone/tree/4e2f15c8b322d41405616d118f13fe2c4abbf26f +Date: Fri Nov 6 10:26:35 2015 +0900 +Subject: aufs4.3 base 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.x-rcN base patch +aufs4.3 base patch diff --git a/MAINTAINERS b/MAINTAINERS -index 8133cef..04beb19 100644 +index 747c653..53ecc33 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -1939,6 +1939,19 @@ F: include/linux/audit.h +@@ -1985,6 +1985,19 @@ F: include/linux/audit.h F: include/uapi/linux/audit.h F: kernel/audit* @@ -33,7 +33,7 @@ index 8133cef..04beb19 100644 M: Miguel Ojeda Sandonis W: http://miguelojeda.es/auxdisplay.htm diff --git a/drivers/block/loop.c b/drivers/block/loop.c -index f7a4c9d..23103ad 100644 +index 674f800a..291ec9e 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -560,6 +560,24 @@ static inline int is_loop_device(struct file *file) @@ -62,10 +62,10 @@ index f7a4c9d..23103ad 100644 static ssize_t loop_attr_show(struct device *dev, char *page, diff --git a/fs/dcache.c b/fs/dcache.c -index 7a3f3e5..0b40298 100644 +index 5c33aeb..8aa7f26 100644 --- a/fs/dcache.c +++ b/fs/dcache.c -@@ -1164,7 +1164,7 @@ enum d_walk_ret { +@@ -1167,7 +1167,7 @@ enum d_walk_ret { * * The @enter() and @finish() callbacks are called with d_lock held. */ @@ -148,10 +148,10 @@ index f87d308..9a290b3 100644 static inline void fput_light(struct file *file, int fput_needed) { diff --git a/include/linux/fs.h b/include/linux/fs.h -index a0653e5..86080ea 100644 +index 72d8a84..fabd9d7a 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1661,6 +1661,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector, +@@ -1687,6 +1687,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector, struct iovec *fast_pointer, struct iovec **ret_pointer); diff --git a/debian/patches/features/all/aufs4/aufs4-mmap.patch b/debian/patches/features/all/aufs4/aufs4-mmap.patch index b7b4a9188..1bdf45f99 100644 --- a/debian/patches/features/all/aufs4/aufs4-mmap.patch +++ b/debian/patches/features/all/aufs4/aufs4-mmap.patch @@ -1,17 +1,18 @@ From: J. R. Okajima -Date: Sat Sep 19 06:24:59 2015 +0900 -Subject: aufs4.x-rcN mmap patch -Origin: https://github.com/sfjro/aufs4-standalone/tree/4e2f15c8b322d41405616d118f13fe2c4abbf26f +Date: Fri Nov 6 10:26:35 2015 +0900 +Subject: aufs4.3 mmap 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.x-rcN mmap patch +aufs4.3 mmap patch -[bwh: Forward-ported to 4.3-rc2: adjust context, indentation] +diff --git a/fs/buffer.c b/fs/buffer.c +index 82283ab..477e5f3 100644 --- a/fs/buffer.c +++ b/fs/buffer.c -@@ -2473,7 +2473,7 @@ int block_page_mkwrite(struct vm_area_st +@@ -2473,7 +2473,7 @@ int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf, * Update file times before taking page lock. We may end up failing the * fault so this update may be superfluous but who really cares... */ @@ -20,9 +21,11 @@ aufs4.x-rcN mmap patch ret = __block_page_mkwrite(vma, vmf, get_block); sb_end_pagefault(sb); +diff --git a/fs/proc/base.c b/fs/proc/base.c +index b25eee4..c83d588 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c -@@ -1914,7 +1914,7 @@ static int proc_map_files_get_link(struc +@@ -1914,7 +1914,7 @@ static int proc_map_files_get_link(struct dentry *dentry, struct path *path) down_read(&mm->mmap_sem); vma = find_exact_vma(mm, vm_start, vm_end); if (vma && vma->vm_file) { @@ -31,9 +34,11 @@ aufs4.x-rcN mmap patch path_get(path); rc = 0; } +diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c +index f8595e8..cb8eda0 100644 --- a/fs/proc/nommu.c +++ b/fs/proc/nommu.c -@@ -45,7 +45,10 @@ static int nommu_region_show(struct seq_ +@@ -45,7 +45,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region) file = region->vm_file; if (file) { @@ -45,9 +50,11 @@ aufs4.x-rcN mmap patch dev = inode->i_sb->s_dev; ino = inode->i_ino; } +diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c +index e2d46ad..5e7e631 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c -@@ -280,7 +280,10 @@ show_map_vma(struct seq_file *m, struct +@@ -280,7 +280,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid) const char *name = NULL; if (file) { @@ -59,7 +66,7 @@ aufs4.x-rcN mmap patch dev = inode->i_sb->s_dev; ino = inode->i_ino; pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT; -@@ -1465,7 +1468,7 @@ static int show_numa_map(struct seq_file +@@ -1465,7 +1468,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid) struct proc_maps_private *proc_priv = &numa_priv->proc_maps; struct vm_area_struct *vma = v; struct numa_maps *md = &numa_priv->md; @@ -68,9 +75,11 @@ aufs4.x-rcN mmap patch struct mm_struct *mm = vma->vm_mm; struct mm_walk walk = { .hugetlb_entry = gather_hugetlb_stats, +diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c +index e0d64c9..7aa92db 100644 --- a/fs/proc/task_nommu.c +++ b/fs/proc/task_nommu.c -@@ -160,7 +160,10 @@ static int nommu_vma_show(struct seq_fil +@@ -160,7 +160,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma, file = vma->vm_file; if (file) { @@ -82,9 +91,11 @@ aufs4.x-rcN mmap patch dev = inode->i_sb->s_dev; ino = inode->i_ino; pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT; +diff --git a/include/linux/mm.h b/include/linux/mm.h +index 80001de..9248b97 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -1190,6 +1190,28 @@ static inline int fixup_user_fault(struc +@@ -1211,6 +1211,28 @@ static inline int fixup_user_fault(struct task_struct *tsk, } #endif @@ -113,6 +124,8 @@ aufs4.x-rcN mmap patch extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write); extern int access_remote_vm(struct mm_struct *mm, unsigned long addr, void *buf, int len, int write); +diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h +index 3d6baa7..750ca95 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -250,6 +250,7 @@ struct vm_region { @@ -131,9 +144,11 @@ aufs4.x-rcN mmap patch void * vm_private_data; /* was vm_pte (shared mem) */ #ifndef CONFIG_MMU +diff --git a/kernel/fork.c b/kernel/fork.c +index 2845623..71004bd 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -462,7 +462,7 @@ static int dup_mmap(struct mm_struct *mm +@@ -462,7 +462,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) struct inode *inode = file_inode(file); struct address_space *mapping = file->f_mapping; @@ -142,9 +157,11 @@ aufs4.x-rcN mmap patch if (tmp->vm_flags & VM_DENYWRITE) atomic_dec(&inode->i_writecount); i_mmap_lock_write(mapping); +diff --git a/mm/Makefile b/mm/Makefile +index 2ed4319..e3a53f5 100644 --- a/mm/Makefile +++ b/mm/Makefile -@@ -21,7 +21,7 @@ obj-y := filemap.o mempool.o oom_kill. +@@ -21,7 +21,7 @@ obj-y := filemap.o mempool.o oom_kill.o \ mm_init.o mmu_context.o percpu.o slab_common.o \ compaction.o vmacache.o \ interval_tree.o list_lru.o workingset.o \ @@ -153,9 +170,11 @@ aufs4.x-rcN mmap patch obj-y += init-mm.o +diff --git a/mm/filemap.c b/mm/filemap.c +index 327910c..7bbc372 100644 --- a/mm/filemap.c +++ b/mm/filemap.c -@@ -2089,7 +2089,7 @@ int filemap_page_mkwrite(struct vm_area_ +@@ -2089,7 +2089,7 @@ int filemap_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) int ret = VM_FAULT_LOCKED; sb_start_pagefault(inode->i_sb); @@ -164,9 +183,11 @@ aufs4.x-rcN mmap patch lock_page(page); if (page->mapping != inode->i_mapping) { unlock_page(page); +diff --git a/mm/memory.c b/mm/memory.c +index deb679c..df2ce3e 100644 --- a/mm/memory.c +++ b/mm/memory.c -@@ -2035,7 +2035,7 @@ static inline int wp_page_reuse(struct m +@@ -2035,7 +2035,7 @@ static inline int wp_page_reuse(struct mm_struct *mm, } if (!page_mkwrite) @@ -175,9 +196,11 @@ aufs4.x-rcN mmap patch } return VM_FAULT_WRITE; +diff --git a/mm/mmap.c b/mm/mmap.c +index 79bcc9f..da28c8a 100644 --- a/mm/mmap.c +++ b/mm/mmap.c -@@ -275,7 +275,7 @@ static struct vm_area_struct *remove_vma +@@ -275,7 +275,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma) if (vma->vm_ops && vma->vm_ops->close) vma->vm_ops->close(vma); if (vma->vm_file) @@ -186,7 +209,7 @@ aufs4.x-rcN mmap patch mpol_put(vma_policy(vma)); kmem_cache_free(vm_area_cachep, vma); return next; -@@ -887,7 +887,7 @@ again: remove_next = 1 + (end > next-> +@@ -887,7 +887,7 @@ again: remove_next = 1 + (end > next->vm_end); if (remove_next) { if (file) { uprobe_munmap(next, next->vm_start, next->vm_end); @@ -195,7 +218,7 @@ aufs4.x-rcN mmap patch } if (next->anon_vma) anon_vma_merge(vma, next); -@@ -1682,8 +1682,8 @@ out: +@@ -1683,8 +1683,8 @@ out: return addr; unmap_and_free_vma: @@ -205,7 +228,7 @@ aufs4.x-rcN mmap patch /* Undo any partial mapping done by a device driver. */ unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end); -@@ -2484,7 +2484,7 @@ static int __split_vma(struct mm_struct +@@ -2485,7 +2485,7 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, goto out_free_mpol; if (new->vm_file) @@ -214,7 +237,7 @@ aufs4.x-rcN mmap patch if (new->vm_ops && new->vm_ops->open) new->vm_ops->open(new); -@@ -2503,7 +2503,7 @@ static int __split_vma(struct mm_struct +@@ -2504,7 +2504,7 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, if (new->vm_ops && new->vm_ops->close) new->vm_ops->close(new); if (new->vm_file) @@ -223,7 +246,7 @@ aufs4.x-rcN mmap patch unlink_anon_vmas(new); out_free_mpol: mpol_put(vma_policy(new)); -@@ -2645,7 +2645,6 @@ SYSCALL_DEFINE5(remap_file_pages, unsign +@@ -2646,7 +2646,6 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, struct vm_area_struct *vma; unsigned long populate = 0; unsigned long ret = -EINVAL; @@ -231,7 +254,7 @@ aufs4.x-rcN mmap patch pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. " "See Documentation/vm/remap_file_pages.txt.\n", -@@ -2689,10 +2688,10 @@ SYSCALL_DEFINE5(remap_file_pages, unsign +@@ -2690,10 +2689,10 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, munlock_vma_pages_range(vma, start, start + size); } @@ -244,7 +267,7 @@ aufs4.x-rcN mmap patch out: up_write(&mm->mmap_sem); if (populate) -@@ -2962,7 +2961,7 @@ struct vm_area_struct *copy_vma(struct v +@@ -2963,7 +2962,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, if (anon_vma_clone(new_vma, vma)) goto out_free_mempol; if (new_vma->vm_file) @@ -253,9 +276,11 @@ aufs4.x-rcN mmap patch if (new_vma->vm_ops && new_vma->vm_ops->open) new_vma->vm_ops->open(new_vma); vma_link(mm, new_vma, prev, rb_link, rb_parent); +diff --git a/mm/nommu.c b/mm/nommu.c +index ab14a20..fffc566 100644 --- a/mm/nommu.c +++ b/mm/nommu.c -@@ -671,7 +671,7 @@ static void __put_nommu_region(struct vm +@@ -671,7 +671,7 @@ static void __put_nommu_region(struct vm_region *region) up_write(&nommu_region_sem); if (region->vm_file) @@ -264,7 +289,7 @@ aufs4.x-rcN mmap patch /* IO memory and memory shared directly out of the pagecache * from ramfs/tmpfs mustn't be released here */ -@@ -829,7 +829,7 @@ static void delete_vma(struct mm_struct +@@ -829,7 +829,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma) if (vma->vm_ops && vma->vm_ops->close) vma->vm_ops->close(vma); if (vma->vm_file) @@ -295,6 +320,9 @@ aufs4.x-rcN mmap patch kmem_cache_free(vm_area_cachep, vma); return ret; +diff --git a/mm/prfile.c b/mm/prfile.c +new file mode 100644 +index 0000000..b323b8a --- /dev/null +++ b/mm/prfile.c @@ -0,0 +1,86 @@ diff --git a/debian/patches/features/all/aufs4/aufs4-standalone.patch b/debian/patches/features/all/aufs4/aufs4-standalone.patch index fc28158d4..6dd9b37cc 100644 --- a/debian/patches/features/all/aufs4/aufs4-standalone.patch +++ b/debian/patches/features/all/aufs4/aufs4-standalone.patch @@ -1,15 +1,15 @@ From: J. R. Okajima -Date: Sat Sep 19 06:24:59 2015 +0900 -Subject: aufs4.x-rcN standalone patch -Origin: https://github.com/sfjro/aufs4-standalone/tree/4e2f15c8b322d41405616d118f13fe2c4abbf26f +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.x-rcN standalone patch +aufs4.3 standalone patch -[bwh: Forward-ported to 4.3-rc2: remove export of inode_sb_list_lock which - no longer exists as a global variable] +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: @@ -20,6 +20,20 @@ aufs4.x-rcN standalone patch /* * 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: @@ -38,9 +52,11 @@ aufs4.x-rcN standalone patch 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 *m +@@ -463,6 +463,7 @@ void __mnt_drop_write(struct vfsmount *mnt) mnt_dec_writers(real_mount(mnt)); preempt_enable(); } @@ -48,7 +64,7 @@ aufs4.x-rcN standalone patch /** * mnt_drop_write - give up write access to a mount -@@ -1803,6 +1804,7 @@ int iterate_mounts(int (*f)(struct vfsmo +@@ -1803,6 +1804,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, } return 0; } @@ -56,6 +72,8 @@ aufs4.x-rcN standalone patch 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 @@ @@ -66,7 +84,7 @@ aufs4.x-rcN standalone patch #include #include "fsnotify.h" -@@ -72,6 +73,7 @@ void fsnotify_get_group(struct fsnotify_ +@@ -72,6 +73,7 @@ void fsnotify_get_group(struct fsnotify_group *group) { atomic_inc(&group->refcnt); } @@ -74,7 +92,7 @@ aufs4.x-rcN standalone patch /* * Drop a reference to a group. Free it if it's through. -@@ -81,6 +83,7 @@ void fsnotify_put_group(struct fsnotify_ +@@ -81,6 +83,7 @@ void fsnotify_put_group(struct fsnotify_group *group) if (atomic_dec_and_test(&group->refcnt)) fsnotify_final_destroy_group(group); } @@ -82,7 +100,7 @@ aufs4.x-rcN standalone patch /* * Create a new fsnotify_group and hold a reference for the group returned. -@@ -109,6 +112,7 @@ struct fsnotify_group *fsnotify_alloc_gr +@@ -109,6 +112,7 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) return group; } @@ -90,9 +108,11 @@ aufs4.x-rcN standalone patch 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_m +@@ -109,6 +109,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) mark->free_mark(mark); } } @@ -100,7 +120,7 @@ aufs4.x-rcN standalone patch /* 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 fsnoti +@@ -208,6 +209,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark, mutex_unlock(&group->mark_mutex); fsnotify_free_mark(mark); } @@ -108,15 +128,15 @@ aufs4.x-rcN standalone patch void fsnotify_destroy_marks(struct hlist_head *head, spinlock_t *lock) { -@@ -402,6 +404,7 @@ int fsnotify_add_mark(struct fsnotify_ma - mutex_unlock(&group->mark_mutex); +@@ -392,6 +394,7 @@ err: + return ret; } +EXPORT_SYMBOL_GPL(fsnotify_add_mark); - /* - * Given a list of marks, find the mark associated with given group. If found -@@ -492,6 +495,7 @@ void fsnotify_init_mark(struct fsnotify_ + 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; } @@ -124,9 +144,11 @@ aufs4.x-rcN standalone patch 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, l +@@ -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; } @@ -142,6 +164,8 @@ aufs4.x-rcN standalone patch 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) @@ -152,7 +176,7 @@ aufs4.x-rcN standalone patch vfs_writef_t vfs_writef(struct file *file) { -@@ -515,6 +516,7 @@ vfs_writef_t vfs_writef(struct file *fil +@@ -515,6 +516,7 @@ vfs_writef_t vfs_writef(struct file *file) return new_sync_write; return ERR_PTR(-ENOSYS); } @@ -160,9 +184,11 @@ aufs4.x-rcN standalone patch 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_in +@@ -1115,6 +1115,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, return splice_write(pipe, out, ppos, len, flags); } @@ -170,7 +196,7 @@ aufs4.x-rcN standalone patch /* * Attempt to initiate a splice from a file to a pipe. -@@ -1141,6 +1142,7 @@ long do_splice_to(struct file *in, loff_ +@@ -1141,6 +1142,7 @@ long do_splice_to(struct file *in, loff_t *ppos, return splice_read(in, ppos, pipe, len, flags); } @@ -178,9 +204,11 @@ aufs4.x-rcN standalone patch /** * 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 +@@ -207,6 +207,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value, *xattr_value = value; return error; } @@ -188,6 +216,8 @@ aufs4.x-rcN standalone patch /* 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) @@ -205,6 +235,8 @@ aufs4.x-rcN standalone patch #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 @@ @@ -215,7 +247,7 @@ aufs4.x-rcN standalone patch #include #include #include -@@ -849,6 +850,7 @@ int __devcgroup_inode_permission(struct +@@ -849,6 +850,7 @@ int __devcgroup_inode_permission(struct inode *inode, int mask) return __devcgroup_check_permission(type, imajor(inode), iminor(inode), access); } @@ -223,9 +255,11 @@ aufs4.x-rcN standalone patch 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 +@@ -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); } @@ -233,7 +267,7 @@ aufs4.x-rcN standalone patch int security_path_unlink(struct path *dir, struct dentry *dentry) { -@@ -449,6 +450,7 @@ int security_path_symlink(struct path *d +@@ -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); } @@ -241,7 +275,7 @@ aufs4.x-rcN standalone patch 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 *ol +@@ -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); } @@ -249,7 +283,7 @@ aufs4.x-rcN standalone patch 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 * +@@ -484,6 +487,7 @@ int security_path_truncate(struct path *path) return 0; return call_int_hook(path_truncate, 0, path); } @@ -257,7 +291,7 @@ aufs4.x-rcN standalone patch int security_path_chmod(struct path *path, umode_t mode) { -@@ -491,6 +495,7 @@ int security_path_chmod(struct path *pat +@@ -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); } @@ -265,7 +299,7 @@ aufs4.x-rcN standalone patch int security_path_chown(struct path *path, kuid_t uid, kgid_t gid) { -@@ -498,6 +503,7 @@ int security_path_chown(struct path *pat +@@ -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); } @@ -273,7 +307,7 @@ aufs4.x-rcN standalone patch int security_path_chroot(struct path *path) { -@@ -583,6 +589,7 @@ int security_inode_readlink(struct dentr +@@ -583,6 +589,7 @@ int security_inode_readlink(struct dentry *dentry) return 0; return call_int_hook(inode_readlink, 0, dentry); } @@ -281,7 +315,7 @@ aufs4.x-rcN standalone patch int security_inode_follow_link(struct dentry *dentry, struct inode *inode, bool rcu) -@@ -598,6 +605,7 @@ int security_inode_permission(struct ino +@@ -598,6 +605,7 @@ int security_inode_permission(struct inode *inode, int mask) return 0; return call_int_hook(inode_permission, 0, inode, mask); } @@ -289,7 +323,7 @@ aufs4.x-rcN standalone patch int security_inode_setattr(struct dentry *dentry, struct iattr *attr) { -@@ -736,6 +744,7 @@ int security_file_permission(struct file +@@ -736,6 +744,7 @@ int security_file_permission(struct file *file, int mask) return fsnotify_perm(file, mask); } @@ -297,7 +331,7 @@ aufs4.x-rcN standalone patch int security_file_alloc(struct file *file) { -@@ -795,6 +804,7 @@ int security_mmap_file(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); }